Add timeout to Docket worker shutdown #19940
Merged
+15
−1
Conversation
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
desertaxle
requested review from
chrisguidry,
cicdw and
zzstoatzz
as code owners
zzstoatzz
approved these changes
Dec 23, 2025
CodSpeed Performance ReportMerging #19940 will not alter performanceComparing Summary
|
chrisguidry
reviewed
Dec 23, 2025
Comment on lines
+69
to
+75
| logger.debug( | ||
| "Waiting for background worker to finish after cancellation..." | ||
| ) | ||
| await asyncio.wait_for(worker_task, timeout=5.0) | ||
| logger.debug( | ||
| "Background worker finished successfully after cancellation" | ||
| ) |
Collaborator
There was a problem hiding this comment.
@desertaxle I'm working on a fix for this in Docket which should be safer because it will still allow any currently running tasks to finish. I'll let you know as soon as the fix is released
Collaborator
There was a problem hiding this comment.
@desertaxle The fix is in Docket 0.16.2 if you want to give it a test without needing the timeout here.
I'm also noticing that this function __aexit__s the Worker context while the worker.run_forever() task is still going, that might cause some issues with the Worker's internal state variables. It would be better to have the async with Worker(...): cover the worker task cancellation and cleanup.
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.
The Docket worker cancellation is causing the server to hang on shutdown. This PR doesn't solve the underlying issue, but it does prevent the server from hanging by adding a max time that the server will wait for Docket worker shutdown.
Closes #19924
Related to chrisguidry/docket#260