Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent deadlock on --net=container:<self> #12799

Merged
merged 1 commit into from Apr 27, 2015

Conversation

@aidanhs
Copy link
Contributor

@aidanhs aidanhs commented Apr 27, 2015

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.

@aidanhs
Copy link
Contributor Author

@aidanhs aidanhs commented Apr 27, 2015

cc @LK4D4

@aidanhs aidanhs changed the title Prevent deadlock on --net=container:self Prevent deadlock on --net=container:<self> Apr 27, 2015
@aidanhs aidanhs force-pushed the aidanhs:aphs-fix-net-container-deadlock branch from cfc0a41 to 7ca7ff8 Apr 27, 2015
@aidanhs
Copy link
Contributor Author

@aidanhs aidanhs commented Apr 27, 2015

Are windows tests known to be a bit flaky?
TestContainerApiStartVolumesFrom failed (but seemed unrelated) so I pushed a style tweak I wanted anyway and now the windows build is fine...

Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
@aidanhs aidanhs force-pushed the aidanhs:aphs-fix-net-container-deadlock branch from 7ca7ff8 to f30d1c1 Apr 27, 2015
@estesp
Copy link
Contributor

@estesp estesp commented Apr 27, 2015

@aidanhs thanks for updating the test--this is a good catch!

LGTM

@LK4D4
Copy link
Contributor

@LK4D4 LK4D4 commented Apr 27, 2015

Lol :)
LGTM

LK4D4 added a commit that referenced this pull request Apr 27, 2015
Prevent deadlock on --net=container:<self>
@LK4D4 LK4D4 merged commit 02d73d9 into moby:master Apr 27, 2015
3 checks passed
3 checks passed
@GordonTheTurtle
docker/dco-signed All commits signed
Details
@GordonTheTurtle
janky Jenkins build Docker-PRs 6819 has succeeded
Details
@GordonTheTurtle
windows Jenkins build Windows-PRs 3782 has succeeded
Details
@aidanhs aidanhs deleted the aidanhs:aphs-fix-net-container-deadlock branch Apr 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants