Skip to content

Consolidate pollForSettingChanges with other producer subroutines #855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandur merged 1 commit into from
Apr 28, 2025
Merged

Consolidate pollForSettingChanges with other producer subroutines #855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,18 +370,6 @@ func (p *producer) StartWorkContext(fetchCtx, workCtx context.Context) error {
p.Logger.DebugContext(fetchCtx, p.Name+": Run loop stopped", slog.String("queue", p.config.Queue), slog.Uint64("num_completed_jobs", p.numJobsRan.Load()))
}()

var wg sync.WaitGroup
defer wg.Wait()
if p.config.Notifier == nil {
p.Logger.DebugContext(fetchCtx, p.Name+": No notifier configured; starting in poll mode", "client_id", p.config.ClientID)

wg.Add(1)
go func() {
defer wg.Done()
p.pollForSettingChanges(fetchCtx, initiallyPaused, initialMetadata)
}()
}

if insertSub != nil {
defer insertSub.Unlisten(fetchCtx)
}
Expand All @@ -390,20 +378,27 @@ func (p *producer) StartWorkContext(fetchCtx, workCtx context.Context) error {
defer controlSub.Unlisten(fetchCtx)
}

var subroutineWg sync.WaitGroup
subroutineWg.Add(3)
var subroutineWG sync.WaitGroup
subroutineWG.Add(3)
subroutineCtx, cancelSubroutines := context.WithCancelCause(context.WithoutCancel(fetchCtx))
go p.heartbeatLogLoop(subroutineCtx, &subroutineWg)
go p.reportQueueStatusLoop(subroutineCtx, &subroutineWg)
go p.reportProducerStatusLoop(subroutineCtx, &subroutineWg)
go p.heartbeatLogLoop(subroutineCtx, &subroutineWG)
go p.reportQueueStatusLoop(subroutineCtx, &subroutineWG)
go p.reportProducerStatusLoop(subroutineCtx, &subroutineWG)

if p.config.Notifier == nil {
p.Logger.DebugContext(subroutineCtx, p.Name+": No notifier configured; starting in poll mode", "client_id", p.config.ClientID)

subroutineWG.Add(1)
go p.pollForSettingChanges(subroutineCtx, &subroutineWG, initiallyPaused, initialMetadata)
}

p.fetchAndRunLoop(fetchCtx, workCtx, fetchLimiter)
p.Logger.Debug(p.Name+": Entering shutdown loop", slog.String("queue", p.config.Queue), slog.Int64("id", p.id.Load()))
p.executorShutdownLoop()

p.Logger.Debug(p.Name+": Shutdown loop exited, awaiting subroutines", slog.String("queue", p.config.Queue), slog.Int64("id", p.id.Load()))
cancelSubroutines(errors.New("producer stopped"))
subroutineWg.Wait()
subroutineWG.Wait()
p.Logger.Debug(p.Name+": Shutdown subroutines completed, finalizing", slog.String("queue", p.config.Queue), slog.Int64("id", p.id.Load()))

p.finalizeShutdown(context.WithoutCancel(fetchCtx))
Expand Down Expand Up @@ -790,7 +785,9 @@ func (p *producer) handleWorkerDone(job *rivertype.JobRow) {
p.jobResultCh <- job
}

func (p *producer) pollForSettingChanges(ctx context.Context, lastPaused bool, lastMetadata []byte) {
func (p *producer) pollForSettingChanges(ctx context.Context, wg *sync.WaitGroup, lastPaused bool, lastMetadata []byte) {
defer wg.Done()

ticker := time.NewTicker(p.config.QueuePollInterval)
for {
select {
Expand Down
Loading