d09575fb8f
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 https://github.com/moby/moby/issues/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 7318eba5b2f8bb4b867ca943c3229260ca98a3bc) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
48 lines
1.3 KiB
Go
48 lines
1.3 KiB
Go
// +build windows
|
|
|
|
package daemon
|
|
|
|
import (
|
|
"sort"
|
|
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/volume"
|
|
)
|
|
|
|
// setupMounts configures the mount points for a container by appending each
|
|
// of the configured mounts on the container to the OCI mount structure
|
|
// which will ultimately be passed into the oci runtime during container creation.
|
|
// It also ensures each of the mounts are lexicographically sorted.
|
|
|
|
// BUGBUG TODO Windows containerd. This would be much better if it returned
|
|
// an array of runtime spec mounts, not container mounts. Then no need to
|
|
// do multiple transitions.
|
|
|
|
func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, error) {
|
|
var mnts []container.Mount
|
|
for _, mount := range c.MountPoints { // type is volume.MountPoint
|
|
if err := daemon.lazyInitializeVolume(c.ID, mount); err != nil {
|
|
return nil, err
|
|
}
|
|
s, err := mount.Setup(c.MountLabel, 0, 0, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
mnts = append(mnts, container.Mount{
|
|
Source: s,
|
|
Destination: mount.Destination,
|
|
Writable: mount.RW,
|
|
})
|
|
}
|
|
|
|
sort.Sort(mounts(mnts))
|
|
return mnts, nil
|
|
}
|
|
|
|
// setBindModeIfNull is platform specific processing which is a no-op on
|
|
// Windows.
|
|
func setBindModeIfNull(bind *volume.MountPoint) {
|
|
return
|
|
}
|