fix: prevent queue consumer deadlocks - #4201
Merged
Merged
Conversation
4 tasks
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d52a7dd43f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Supervise streaming producers and consumers together so callback cancellation cannot strand an active stream. Await sandbox memory workers directly and preserve cleanup on failure. Co-authored-by: abhay-codes07 <abhaysingh0293@gmail.com>
seratch
force-pushed
the
fix/queue-consumer-deadlock
branch
from
August 5, 2026 10:43
d52a7dd to
d150755
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
1 participant
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 pull request fixes #4198 deadlocks that occur when streaming callbacks or sandbox memory workers terminate with
CancelledErroror anotherBaseException.It builds on the core approach proposed by @abhay-codes07 in #4199: remove deadlock-prone
Queue.join()waits and observe the consumer task directly. This version extends that approach by supervising producers and consumers together, preserving parent cancellation, guaranteeing Codex span cleanup, clearing failed memory worker state, and adding regression coverage for blocked producers and memory worker failures.The original contributor is credited through the commit's
Co-authored-bytrailer.