Fix deadlock in events forwarding when connection closes#141
Merged
akerouanton merged 1 commit intocontainerd:mainfrom Apr 1, 2026
Merged
Fix deadlock in events forwarding when connection closes#141akerouanton merged 1 commit intocontainerd:mainfrom
akerouanton merged 1 commit intocontainerd:mainfrom
Conversation
Use the service context to prevent the stream receiver from exiting when the connection which started it closes. This can cause a deadlock in the ttrpc stream waiting for events to be received without any receiver to consume them. Signed-off-by: Derek McGowan <derek@mcg.dev>
There was a problem hiding this comment.
Pull request overview
This PR addresses a deadlock scenario in the shim’s VM event forwarding by ensuring the VM event stream receiver is not tied to the lifetime of the RPC connection that initiated it.
Changes:
- Switch the VM events
Streamcall to use the shim’s long-lived service context rather than the per-RPC context. - Add in-code documentation explaining the deadlock mechanism and why the long-lived context is required.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
akerouanton
approved these changes
Apr 1, 2026
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.
Use the service context to prevent the stream receiver from exiting when the connection which started it closes. This can cause a deadlock in the ttrpc stream waiting for events to be received without any receiver to consume them.