This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
Don't create source directory while the daemon is being shutdown, fix… #48
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
… #30348 If a container mount the socket the daemon is listening on into container while the daemon is being shutdown, the socket will not exist on the host, then daemon will assume it's a directory and create it on the host, this will cause the daemon can't start next time. fix issue moby/moby#30348 To reproduce this issue, you can add following code ``` --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -8,6 +8,7 @@ import ( "sort" "strconv" "strings" + "time" "github.com/Sirupsen/logrus" "github.com/docker/docker/container" @@ -666,7 +667,8 @@ func (daemon *Daemon) createSpec(c *container.Container) (*libcontainerd.Spec, e if err := daemon.setupIpcDirs(c); err != nil { return nil, err } - + fmt.Printf("===please stop the daemon===\n") + time.Sleep(time.Second * 2) ms, err := daemon.setupMounts(c) if err != nil { return nil, err ``` step1 run a container which has `--restart always` and `-v /var/run/docker.sock:/sock` ``` $ docker run -ti --restart always -v /var/run/docker.sock:/sock busybox / # ``` step2 exit the the container ``` / # exit ``` and kill the daemon when you see ``` ===please stop the daemon=== ``` in the daemon log The daemon can't restart again and fail with `can't create unix socket /var/run/docker.sock: is a directory`. Signed-off-by: Lei Jitang <leijitang@huawei.com> (cherry picked from commit 7318eba) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
40 tasks
|
LGTM |
andrewhsu
added a commit
that referenced
this pull request
Sep 19, 2017
…_package_building Removes engine VERSION dependency Upstream-commit: 3c05e03 Component: packaging
3 tasks
docker-jenkins
pushed a commit
that referenced
this pull request
Sep 13, 2018
[18.09] backport "daemon.ContainerLogs(): fix resource leak on follow" Upstream-commit: 6531bac59bfd453456231511bdc3efade1fc9481 Component: engine
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Jan 30, 2020
…y_from_package_building Removes engine VERSION dependency Upstream-commit: 3c05e03 Component: packaging
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Jan 30, 2020
…y_from_package_building Removes engine VERSION dependency
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Feb 3, 2020
Don't create source directory while the daemon is being shutdown, fix…
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Cherry-picked from: moby/moby#33330
… #30348
If a container mount the socket the daemon is listening on into
container while the daemon is being shutdown, the socket will
not exist on the host, then daemon will assume it's a directory
and create it on the host, this will cause the daemon can't start
next time.
fix issue moby/moby#30348
To reproduce this issue, you can add following code
step1 run a container which has
--restart alwaysand-v /var/run/docker.sock:/sockstep2 exit the the container
and kill the daemon when you see
in the daemon log
The daemon can't restart again and fail with
can't create unix socket /var/run/docker.sock: is a directory.Signed-off-by: Lei Jitang leijitang@huawei.com
(cherry picked from commit 7318eba)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com
Signed-off-by: Eli Uriegas eli.uriegas@docker.com