[release/1.6] runc.v1/v2: return init pid when clean dead shim#6572
Merged
mxpv merged 2 commits intocontainerd:release/1.6from Feb 21, 2022
Merged
[release/1.6] runc.v1/v2: return init pid when clean dead shim#6572mxpv merged 2 commits intocontainerd:release/1.6from
mxpv merged 2 commits intocontainerd:release/1.6from
Conversation
If containerd-shim-runc-v2 process dead abnormally, such as received kill 9 signal, panic or other unkown reasons, the containerd-shim-runc-v2 server can not reap runc container and forward init process exit event. This will lead the container leaked in dockerd. When shim dead, containerd will clean dead shim, here read init process pid and forward exit event with pid at the same time. Signed-off-by: Jeff Zvier <[email protected]> (cherry picked from commit 356ca75) Signed-off-by: Wei Fu <[email protected]>
If containerd-shim-runc-v1 process dead abnormally, such as received kill -s 9 signal, panic or other unkown reasons, the containerd-shim-runc-v1 server can not reap runc container and forward init process exit event. This will lead the container leaked in dockerd. When shim dead, containerd will clean dead shim, here read init process pid and forward exit event with pid at the same time. Related to: containerd#6402 Signed-off-by: Jeff Zvier <[email protected]> Signed-off-by: Wei Fu <[email protected]> (cherry picked from commit 7901f4b) Signed-off-by: Wei Fu <[email protected]>
Member
|
Marking as a draft, as #6571 is not merged yet |
kzys
approved these changes
Feb 21, 2022
mxpv
approved these changes
Feb 21, 2022
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
6 participants
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.
If containerd-shim-runc-v1/v2 process dead abnormally, such as received
kill 9 signal, panic or other unkown reasons, the containerd-shim-runc-v1/v2
server can not reap runc container and forward init process exit event.
This will lead the container leaked in dockerd. When shim dead, containerd
will clean dead shim, here read init process pid and forward exit event
with pid at the same time.
cherry-pick #6452 and #6571