v2: Call shim.Delete at first when create is failed#3921
Merged
estesp merged 1 commit intocontainerd:masterfrom Dec 31, 2019
Merged
v2: Call shim.Delete at first when create is failed#3921estesp merged 1 commit intocontainerd:masterfrom
estesp merged 1 commit intocontainerd:masterfrom
Conversation
If the context is cancelled during `shim.Create()`, such as the client disconnects unexpectedly. The created shim will never be deleted. What's more, if the context is cancelled during `openShimLog()`, the fifo will be closed and block the shim output. Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
be323b2 to
d82fa43
Compare
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## master #3921 +/- ##
==========================================
- Coverage 42.43% 42.42% -0.02%
==========================================
Files 130 130
Lines 14706 14710 +4
==========================================
Hits 6241 6241
- Misses 7544 7548 +4
Partials 921 921
Continue to review full report at Codecov.
|
Member
|
LGTM |
TBBle
reviewed
Jan 4, 2020
| return nil, err | ||
| } | ||
| f, err := openShimLog(ctx, b.bundle, client.AnonDialer) | ||
| f, err := openShimLog(context.Background(), b.bundle, client.AnonDialer) |
darfux
added a commit
to darfux/containerd
that referenced
this pull request
Jan 5, 2020
Related to containerd#3921 (comment) Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
tussennet
pushed a commit
to tussennet/containerd
that referenced
this pull request
Sep 11, 2020
Related to containerd#3921 (comment) Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
thaJeztah
pushed a commit
to thaJeztah/containerd
that referenced
this pull request
Nov 19, 2020
Related to containerd#3921 (comment) Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com> (cherry picked from commit 1fb1d93) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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
5 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 the context is cancelled during
shim.Create(), such as the client disconnects unexpectedly. The created shim will never be deleted.What's more, if the context is cancelled during
openShimLog(), the fifo will be closed and block the shim output.Signed-off-by: Li Yuxuan liyuxuan04@baidu.com