fix(api): serve until the "acceptconnections" job #4398
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
| // We don't want to start serving on these sockets until the | ||
| // "initserver" job has completed. Otherwise required handlers | ||
| // won't be ready. | ||
| select { |
There was a problem hiding this comment.
Why a select here and not just <-activationLock ?
This fixes a bug that I encountered when using socket activation with docker 0.8.1. When running the first `docker run` it would return: "create: command not found". The root cause was the socket activation code path was starting to listen before the "initserver" job had finished. This meant that the "create" handler hand't been registered yet leading to the command not found error. In log format it looks like this: ``` [/var/lib/docker|9d2e78e9] +job initserver() 2014/03/01 04:05:35 Listening for HTTP on fd () [/var/lib/docker|0d71c177] +job create() create: command not found [/var/lib/docker|0d71c177] -job create() [/var/lib/docker|0d71c177] +job acceptconnections() [/var/lib/docker|0d71c177] -job initserver() = OK (0) ``` To fix the issue select on the activationLock and block until the "acceptconnections" job has ran. Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
|
@crosbymichael Fixed in 8d2226b. Thanks for catching that; it was left over from understanding the listenbuffer. Should be good now. |
|
LGTM |
|
LGTM |
vieux
added a commit
that referenced
this pull request
Mar 3, 2014
fix(api): serve until the "acceptconnections" job
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.
This fixes a bug that I encountered when using socket activation with docker
0.8.1. When running the first
docker runit would return:"create: command not found".
The root cause was the socket activation code path was starting to listen
before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not found
error.
In log format it looks like this:
To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.
Docker-DCO-1.1-Signed-off-by: Brandon Philips brandon.philips@coreos.com (github: philips)