14ffc91dfb
* feat(metadata): expand provider image cache queue * fix(metadata): harden provider image cache queue Addresses bug-review feedback from Codex/CodeRabbit on the metadata image cache pipeline. All findings validated against the code before fixing; false positives (rows/connection deadlock, PhotoSourcePath merge coupling) were confirmed non-issues and left unchanged. - Honor metadata.cache_images for the background processor. The cache_metadata_images task was registered whenever S3 was configured, so merely enabling object storage downloaded the entire provider-artwork catalog even with caching disabled. Add ImageCacheProcessor.SetEnabled, gate RunOnce/RunUntilIdle on it, and wire it (with hot reload) from cfg.Metadata.CacheImages in main.go. - Guard terminal job updates with lease ownership. EnqueueBatch can repurpose a running row with a new source; MarkSucceeded/MarkFailed keyed on id alone let a stale worker finalize the replacement job and drop the new artwork. Thread locked_by through and add status='running' AND locked_by=$n guards. - Avoid uploading stale jobs onto the live artwork key. Verify the target still references the job's source (CurrentTargetSourcePath) before CacheImage, so a job whose source an admin/refresh already replaced cannot overwrite the deterministic storage object. - COALESCE nullable external IDs in EnqueueExistingProviderArtwork. A NULL tmdb_id/tvdb_id/imdb_id on any candidate failed the scan and aborted the whole cache run; matches the existing item_repo pattern. - Stop re-downloading the catalog every 30 days. Discovery now skips targets whose *_path is already a cached relative path, making the cached row the durable dedup marker instead of the prunable job row. - Decouple catalog sweeps from queue draining. RunOnce no longer runs discovery per batch; RunUntilIdle sweeps only when the queue drains and throttles full sweeps to every 15m, so idle installs stop full-scanning every entity table each minute. - Requeue claimed-but-unstarted jobs on cancellation. Acquire the semaphore before spawning workers and RequeueClaimed any jobs not yet started, instead of leaving them locked until the 15m lease expires. - Skip the backoff sleep after the final upload attempt in putObjectWithRetry (saves ~1.5s on permanent failures). - Add the s3/file/local/upload/generated exclusion to the seasons and episodes backfill in migration 20260617184537 for consistency with the later migration (the bad backfill was inert downstream, but the asymmetry is removed). 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
100 lines
2.0 KiB
Go
100 lines
2.0 KiB
Go
package triggers
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/Silo-Server/silo-server/internal/taskmanager"
|
|
)
|
|
|
|
// WeeklyTrigger fires at a specific time on a specific day of the week.
|
|
type WeeklyTrigger struct {
|
|
cfg taskmanager.TriggerConfig
|
|
dayOfWeek time.Weekday
|
|
hour int
|
|
minute int
|
|
ch chan struct{}
|
|
nextRun time.Time
|
|
timer *time.Timer
|
|
stopCh chan struct{}
|
|
mu sync.Mutex
|
|
}
|
|
|
|
func NewWeeklyTrigger(cfg taskmanager.TriggerConfig) *WeeklyTrigger {
|
|
var h, m int
|
|
fmt.Sscanf(cfg.TimeOfDay, "%d:%d", &h, &m)
|
|
return &WeeklyTrigger{
|
|
cfg: cfg,
|
|
dayOfWeek: time.Weekday(cfg.DayOfWeek),
|
|
hour: h,
|
|
minute: m,
|
|
ch: make(chan struct{}, 1),
|
|
}
|
|
}
|
|
|
|
func (w *WeeklyTrigger) calcNextRun(now time.Time) time.Time {
|
|
daysAhead := (int(w.dayOfWeek) - int(now.Weekday()) + 7) % 7
|
|
target := time.Date(now.Year(), now.Month(), now.Day()+daysAhead, w.hour, w.minute, 0, 0, now.Location())
|
|
if daysAhead == 0 && !target.After(now) {
|
|
target = target.Add(7 * 24 * time.Hour)
|
|
}
|
|
return target
|
|
}
|
|
|
|
func (w *WeeklyTrigger) Start(_ *taskmanager.ExecutionResult) {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
|
|
// Drain any stale signal from a previous timer fire.
|
|
select {
|
|
case <-w.ch:
|
|
default:
|
|
}
|
|
|
|
stopCh := make(chan struct{})
|
|
w.nextRun = w.calcNextRun(time.Now())
|
|
timer := time.NewTimer(time.Until(w.nextRun))
|
|
w.stopCh = stopCh
|
|
w.timer = timer
|
|
|
|
go func() {
|
|
select {
|
|
case <-stopCh:
|
|
if !timer.Stop() {
|
|
select {
|
|
case <-timer.C:
|
|
default:
|
|
}
|
|
}
|
|
return
|
|
case <-timer.C:
|
|
select {
|
|
case w.ch <- struct{}{}:
|
|
default:
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
func (w *WeeklyTrigger) Stop() {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
if w.stopCh != nil {
|
|
select {
|
|
case <-w.stopCh:
|
|
default:
|
|
close(w.stopCh)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (w *WeeklyTrigger) NextRunTime() time.Time {
|
|
w.mu.Lock()
|
|
defer w.mu.Unlock()
|
|
return w.nextRun
|
|
}
|
|
|
|
func (w *WeeklyTrigger) Config() taskmanager.TriggerConfig { return w.cfg }
|
|
func (w *WeeklyTrigger) C() <-chan struct{} { return w.ch }
|