Fix job abortion during worker graceful shutdown - #1603
Open
owenh000 wants to merge 1 commit into
Open
Conversation
📝 WalkthroughWalkthroughWorker shutdown keeps the abort-polling side task active while running jobs undergo graceful handling, then cancels it with the remaining side tasks. A unit test verifies that a running async job can be aborted after shutdown begins. ChangesGraceful shutdown abort polling
Estimated code review effort: 2 (Simple) | ~10 minutes 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@tests/unit/test_worker.py`:
- Around line 608-625: Replace the fixed 20 ms sleeps in the worker shutdown and
abort assertions around start_worker and get_job_status_async with bounded
polling that repeatedly checks for the expected Status.DOING or Status.ABORTED
state until a timeout. Preserve the existing status assertions and await
run_task after cancellation, while ensuring the test fails clearly if the
expected state is not reached.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: c587494a-b078-4557-8eab-e9b57450f02d
📒 Files selected for processing (2)
procrastinate/worker.pytests/unit/test_worker.py
10 tasks
sebdiem
reviewed
Jul 26, 2026
owenh000
force-pushed
the
abort-job-during-worker-shutdown
branch
from
July 26, 2026 22:34
9e3dcca to
3066f48
Compare
During worker graceful shutdown, stop the "poll_jobs_to_abort" side task *after* running jobs have ended rather than before. Without this change, it is impossible to abort a running job via abort polling after a worker has been asked to stop. Also add a test that fails without this change. Closes <procrastinate-org#1598>.
owenh000
force-pushed
the
abort-job-during-worker-shutdown
branch
from
July 27, 2026 00:34
3066f48 to
c596387
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
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.
During worker graceful shutdown, stop the "poll_jobs_to_abort" side task after running jobs have ended rather than before. Without this change, it is impossible to abort a running job via abort polling after a worker has been asked to stop.
Also add a test that fails without this change.
Closes #1598
Successful PR Checklist:
PR label(s):
Summary by CodeRabbit
Bug Fixes
Tests