fix: avoid daemon start hang when one shim hang #2666
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #2666 +/- ##
==========================================
- Coverage 69.72% 69.66% -0.06%
==========================================
Files 281 281
Lines 18699 18712 +13
==========================================
- Hits 13037 13035 -2
- Misses 4213 4230 +17
+ Partials 1449 1447 -2
|
allencloud
reviewed
Jan 15, 2019
ctrd/container.go
Outdated
|
|
||
| select { | ||
| case <-time.After(timeout): | ||
| return errors.Wrap(errtypes.ErrTimeout, "connecting to shim") |
There was a problem hiding this comment.
return errors.Wrap(errtypes.ErrTimeout, "failed to connect shim") ?
|
LGTM, wait ci pass |
pouchrobot
added
the
LGTM
if one containerd-shim hang, pouch daemon start will hang since it will stuck in shim, then pouch daemon can never start Signed-off-by: Ace-Tang <aceapril@126.com>
HusterWan
reviewed
Jan 15, 2019
HusterWan
reviewed
Jan 15, 2019
|
LGTM |
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.
if one containerd-shim hang, pouch daemon start will hang since
it will stuck in shim, then pouch daemon can never start
Signed-off-by: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews