Add 30s timeout to PeriodicJobEnqueuer insertBatch#1251
Merged
Conversation
Previously, `PeriodicJobEnqueuer.insertBatch` passed the raw service context directly to `Begin`/`Insert`/`Commit`, with no per-batch deadline. If the underlying connection stalled, the enqueuer would hang indefinitely, halting all periodic job insertion until the process was restarted. Wrap the DB calls in `context.WithTimeout(ctx, riversharedmaintenance.TimeoutDefault)` (30s), matching the pattern already used by `JobScheduler` and `JobRescuer`.
Contributor
Author
|
@brandur I would also like to hotfix this into older version we use (v0.18.0), can we do this after merge? |
Contributor
Author
|
cc @bgentry |
brandur
reviewed
May 15, 2026
Contributor
brandur
left a comment
brandur
left a comment
There was a problem hiding this comment.
Oops, forgot to hit the submit button on my review.
|
|
||
| ### Fixed | ||
|
|
||
| - Wrap `PeriodicJobEnqueuer.insertBatch` database calls in a 30-second timeout. Previously, a stalled pgx `Begin`/`Insert`/`Commit` could hang the periodic enqueuer indefinitely, halting all periodic job insertion until the process was restarted or leader re-elected. |
Contributor
There was a problem hiding this comment.
Could you add a link to the PR here like the other entries have?
brandur
approved these changes
May 15, 2026
Merged
brandur
added a commit
that referenced
this pull request
May 15, 2026
Do a release containing context enhancements in #1251. [skip ci]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously,
PeriodicJobEnqueuer.insertBatchpassed the raw service context directly toBegin/Insert/Commit, with no per-batch deadline (unlike all other calls to the db). If the underlying connection stalled, the enqueuer would hang indefinitely, halting all periodic job insertion until the process was restarted. We have observed this issue multiple times during RW-RO failovers or temporary network unavailability, stalls in our case could last from minutes to hoursWrapped the DB calls in
context.WithTimeout(ctx, riversharedmaintenance.TimeoutDefault)(30s), matching the pattern already used byJobSchedulerandJobRescuer.