Make job rescue paginated to protect against full batch of no-rescue jobs#1318
Merged
Conversation
bgentry
approved these changes
Jul 22, 2026
| ### Fixed | ||
|
|
||
| - Guard against empty job slice returned by `JobSetStateIfRunningMany` when a job has been deleted mid-run. [PR #1308](https://github.com/riverqueue/river/pull/1308). | ||
| - Fixed `JobRescuer` pagination so a full batch of running jobs with disabled or longer worker-specific timeouts can't prevent later stuck jobs from being rescued. |
…jobs This one's aimed at fixing a long-standing bug accidentally detected while working on another rescue-related feature. The `JobRescuer` works by fetching a full batch of jobs to rescue then going through each one to determine what it should be doing about it. The default batch size is 10k, so this generally works perfectly fine. Some stuck jobs are potentially not rescued if their timeout is configured to be -1 (no timeout). Codex identified a tail bug possibility in which if you had an entire batch worth of jobs with -1 timeouts, they'd block any jobs after them from being rescued. So the rescuer would rescue 10k jobs, determine none of them needed rescue, then go back to sleep, stranding any jobs after that. This is such a tail possibility that it's probably fine, but just since we're making changes to the rescue driver boundary right now anyway, it's not a bad time to just get this one fixed up.
brandur
force-pushed
the
brandur-paginated-rescue
branch
from
July 22, 2026 18:39
760f083 to
4ce6835
Compare
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.
This one's aimed at fixing a long-standing bug accidentally detected
while working on another rescue-related feature.
The
JobRescuerworks by fetching a full batch of jobs to rescue thengoing through each one to determine what it should be doing about it.
The default batch size is 10k, so this generally works perfectly fine.
Some stuck jobs are potentially not rescued if their timeout is
configured to be -1 (no timeout).
Codex identified a tail bug possibility in which if you had an entire
batch worth of jobs with -1 timeouts, they'd block any jobs after them
from being rescued. So the rescuer would rescue 10k jobs, determine none
of them needed rescue, then go back to sleep, stranding any jobs after
that.
This is such a tail possibility that it's probably fine, but just since
we're making changes to the rescue driver boundary right now anyway,
it's not a bad time to just get this one fixed up.