Fix close a nil chan err#872
Merged
mlaventure merged 1 commit intocontainerd:v0.2.xfrom May 19, 2017
keloyang:shim-kill
Merged
Conversation
If docker exec to a container, and then kill the runtime's shim process
it will close a nil chan in Supervisor' execExit interface.
Supervisor.exit
|---> s.delete
| |
| V
| execMap := s.getDeleteExecSyncMap(t.ID) make getExecSyncChannel return nil
|
|--->s.execExit
| |
| V
| synCh := s.getExecSyncChannel(t.ID, t.PID)
| |
| V
| close(synCh) close a nil chan make container panic
Signed-off-by: yangshukui <yangshukui@huawei.com>
Contributor
|
LGTM |
This was referenced May 30, 2017
mlaventure
added a commit
to mlaventure/containerd
that referenced
this pull request
Jul 7, 2017
This test that we don't panic if a container init process shim is SiGKILL'ed while having an exec attach to that container. Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
crosbymichael
added a commit
that referenced
this pull request
Aug 2, 2017
This was referenced Oct 4, 2018
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
4 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 docker exec to a container, and then kill the runtime's shim process,it will lead to close a nil chan in Supervisor' execExit interface.
why ?
what I do ?
split getDeleteExecSyncMap to getExecSyncMap and deleteExecSyncMap to make sure delete operation come after the chan's close.
how to reproduce ?
following the steps below, the problem can reproduced every time.
first run a container,
secondly docker exec to the container,
then the kill the runtime's shim proccess,
and you will see the panic info from containerd like this,
Signed-off-by: yangshukui yangshukui@huawei.com