Skip to content

fix: move pubsub publishing out of database transactions to avoid conn exhaustion #17648

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+155 −105
Open

fix: move pubsub publishing out of database transactions to avoid conn exhaustion #17648

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ba2f90a
fix: move pubsub publishing out of database transactions to avoid con…
dannykopping May 1, 2025
74f5dd7
chore: commentary
dannykopping May 2, 2025
f6909ff
chore: polish
dannykopping May 2, 2025
1c84fac
chore: augment reconciler test to validate that broken publish does n…
dannykopping May 2, 2025
5117a5e
Merge branch 'main' of github.com:/coder/coder into dk/notify-outside-tx
dannykopping May 2, 2025
42cc3f5
chore: make lint
dannykopping May 2, 2025
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
Prev Previous commit
Next Next commit
chore: polish 
Signed-off-by: Danny Kopping <dannykopping@gmail.com>
  • Loading branch information
@dannykopping
dannykopping committed May 2, 2025
commit f6909ff17e7ac41db67a065f88fbb72163d0c7c6
16 changes: 8 additions & 8 deletions enterprise/coderd/prebuilds/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type StoreReconciler struct {
running atomic.Bool
stopped atomic.Bool
done chan struct{}
provisionNotifyCh chan *database.ProvisionerJob
provisionNotifyCh chan database.ProvisionerJob
}

var _ prebuilds.ReconciliationOrchestrator = &StoreReconciler{}
Expand All @@ -64,7 +64,7 @@ func NewStoreReconciler(store database.Store,
clock: clock,
registerer: registerer,
done: make(chan struct{}, 1),
provisionNotifyCh: make(chan *database.ProvisionerJob, 100),
provisionNotifyCh: make(chan database.ProvisionerJob, 10),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thumb-suck; I want to protect against temporary network/database blips but also don't want to accumulate too many messages.

}

reconciler.metrics = NewMetricsCollector(store, logger, reconciler)
Expand Down Expand Up @@ -117,11 +117,7 @@ func (c *StoreReconciler) Run(ctx context.Context) {
case <-ctx.Done():
return
case job := <-c.provisionNotifyCh:
if job == nil {
continue
}

err := provisionerjobs.PostJob(c.pubsub, *job)
err := provisionerjobs.PostJob(c.pubsub, job)
if err != nil {
c.logger.Error(ctx, "failed to post provisioner job to pubsub", slog.Error(err))
}
Expand Down Expand Up @@ -600,9 +596,13 @@ func (c *StoreReconciler) provision(
return xerrors.Errorf("provision workspace: %w", err)
}

if provisionerJob == nil {
return nil
}

// Publish provisioner job event outside of transaction.
select {
case c.provisionNotifyCh <- provisionerJob:
case c.provisionNotifyCh <- *provisionerJob:
default: // channel full, drop the message; provisioner will pick this job up later with its periodic check, though.
c.logger.Warn(ctx, "provisioner job notification queue full, dropping",
slog.F("job_id", provisionerJob.ID), slog.F("prebuild_id", prebuildID.String()))
Expand Down
Loading