Prevent deadlock on --net=container:<self> #12799
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
|
cc @LK4D4 |
aidanhs
changed the title
aidanhs
force-pushed
the
aphs-fix-net-container-deadlock
branch
from
cfc0a41
to
7ca7ff8
Compare
|
Are windows tests known to be a bit flaky? |
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
aidanhs
force-pushed
the
aphs-fix-net-container-deadlock
branch
from
7ca7ff8
to
f30d1c1
Compare
|
@aidanhs thanks for updating the test--this is a good catch! LGTM |
|
Lol :) |
LK4D4
added a commit
that referenced
this pull request
Apr 27, 2015
Prevent deadlock on --net=container:<self>
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.
Fixes #12606.
At least, it would have prevented the deadlock I saw.
To be honest, I don't know why there were containers being created on my machine attempting to
--net=container:<self>in the first place. Other people have access to the daemon, but inspect output was indicating that the full container id had been used (i.e.--net=container:<cid>) which is obviously impossible because you can't know the cid before you create the container.So I wonder if there's a second bug which has been auto-populating that field? It'll be interesting to see if people start hitting this new error message.