Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

containerd-shim-runc-v1: return init pid when clean dead shim #6571

Merged
merged 1 commit into from Feb 21, 2022

Conversation

fuweid
Copy link
Member

@fuweid fuweid commented Feb 20, 2022

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: #6402

Signed-off-by: Jeff Zvier zvier20@gmail.com
Signed-off-by: Wei Fu fuweid89@gmail.com

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 <zvier20@gmail.com>
Signed-off-by: Wei Fu <fuweid89@gmail.com>
@theopenlab-ci
Copy link

theopenlab-ci bot commented Feb 20, 2022

Build succeeded.

@fuweid fuweid merged commit d128c37 into containerd:main Feb 21, 2022
@fuweid fuweid added cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-picked/1.4.x PR commits are cherry picked into the release/1.4 branch labels Feb 24, 2022
@fuweid fuweid deleted the fix-6402-for-runc.v1 branch February 24, 2022 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-picked/1.5.x PR commits are cherry-picked into release/1.5 branch cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants