Fix possible race on container restart and restart error handling #25383
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
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
| @@ -260,14 +260,16 @@ func (ctr *container) waitExit(process *process, isFirstProcessToStart bool) err | |||
| err := <-waitRestart | |||
| ctr.restarting = false | |||
| ctr.client.deleteContainer(ctr.friendlyName) | |||
| if err == nil { | |||
There was a problem hiding this comment.
Perfect, exactly what I was hoping for!
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
fix-restart-err
branch
from
ac23539 to
9be0fb4
Compare
|
LGTM. |
|
LGTM |
1 similar comment
|
LGTM |
Merged
liusdu
pushed a commit
to liusdu/moby
that referenced
this pull request
Oct 30, 2017
Fix Bug: canot remove restarting container cherry pick from moby#25383 Signed-off-by: xiekeyang <xiekeyang@huawei.com> See merge request docker/docker!206
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.
Solution for https://github.com/docker/docker/pull/25150/files#r73000548
Supersedes: #25150
@mlaventure @jhowardmsft @cpuguy83