fix(shim): resolve intermittent deadlocks and hangs in monitor module#458
Closed
novahe wants to merge 1 commit intocontainerd:mainfrom
Closed
fix(shim): resolve intermittent deadlocks and hangs in monitor module#458novahe wants to merge 1 commit intocontainerd:mainfrom
novahe wants to merge 1 commit intocontainerd:mainfrom
Conversation
This commit addresses several deadlock and hang scenarios in the monitor module: - Replaced tokio::sync::Mutex with std::sync::Mutex to allow safe Drop implementation. - Switched to unbounded channels to prevent Reaper thread blocking on subscriber backpressure. - Restored in-lock notification to ensure strict FIFO ordering and unsubscription consistency.
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.
Description
This PR addresses intermittent hangs and potential deadlocks in the containerd-shim monitor module by optimizing the locking mechanism and event distribution logic.
The Problem
The previous implementation suffered from two main issues:
runtime (e.g., during shim shutdown or from a blocking thread), it caused panics or hung the process.
other process exits from being collected, leading to zombie processes and a total shim hang under heavy workloads.
The Solution
execution context without relying on the async runtime.
unbounded channels ensure that the producer (the Reaper thread) is never blocked by subscriber backpressure.
ordering of events and providing a guarantee that no events are delivered after a successful unsubscription.