Merge pull request #15848 from calavera/revert_ipc_mounts

DO NOT MERGE: Check if these commits broke the builds.

daemon/container.go

@@ -293,17 +293,10 @@ func (container *Container) Start() (err error) {
 		return err
 	}
 
-	if !(container.hostConfig.IpcMode.IsContainer() || container.hostConfig.IpcMode.IsHost()) {
-		if err := container.setupIpcDirs(); err != nil {
-			return err
-		}
-	}
-
 	mounts, err := container.setupMounts()
 	if err != nil {
 		return err
 	}
-	mounts = append(mounts, container.ipcMounts()...)
 
 	container.command.Mounts = mounts
 	return container.waitForStart()
@@ -362,10 +355,6 @@ func (container *Container) isNetworkAllocated() bool {
 func (container *Container) cleanup() {
 	container.ReleaseNetwork()
 
-	if err := container.unmountIpcMounts(); err != nil {
-		logrus.Errorf("%v: Failed to umount ipc filesystems: %v", container.ID, err)
-	}
-
 	if err := container.Unmount(); err != nil {
 		logrus.Errorf("%v: Failed to umount filesystem: %v", container.ID, err)
 	}

daemon/container_unix.go

@@ -45,8 +45,6 @@ type Container struct {
 	AppArmorProfile string
 	HostnamePath    string
 	HostsPath       string
-	ShmPath         string
-	MqueuePath      string
 	MountPoints     map[string]*mountPoint
 	ResolvConfPath  string
 	UpdateDns       bool
@@ -186,16 +184,6 @@ func populateCommand(c *Container, env []string) error {
 	}
 
 	ipc := &execdriver.Ipc{}
-	var err error
-	c.ShmPath, err = c.shmPath()
-	if err != nil {
-		return err
-	}
-
-	c.MqueuePath, err = c.mqueuePath()
-	if err != nil {
-		return err
-	}
 
 	if c.hostConfig.IpcMode.IsContainer() {
 		ic, err := c.getIpcContainer()
@@ -203,14 +191,8 @@ func populateCommand(c *Container, env []string) error {
 			return err
 		}
 		ipc.ContainerID = ic.ID
-		c.ShmPath = ic.ShmPath
-		c.MqueuePath = ic.MqueuePath
 	} else {
 		ipc.HostIpc = c.hostConfig.IpcMode.IsHost()
-		if ipc.HostIpc {
-			c.ShmPath = "/dev/shm"
-			c.MqueuePath = "/dev/mqueue"
-		}
 	}
 
 	pid := &execdriver.Pid{}
@@ -1217,85 +1199,3 @@ func (container *Container) removeMountPoints() error {
 	}
 	return nil
 }
-
-func (container *Container) shmPath() (string, error) {
-	return container.GetRootResourcePath("shm")
-}
-func (container *Container) mqueuePath() (string, error) {
-	return container.GetRootResourcePath("mqueue")
-}
-
-func (container *Container) setupIpcDirs() error {
-	shmPath, err := container.shmPath()
-	if err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(shmPath, 0700); err != nil {
-		return err
-	}
-
-	if err := syscall.Mount("shm", shmPath, "tmpfs", uintptr(syscall.MS_NOEXEC|syscall.MS_NOSUID|syscall.MS_NODEV), label.FormatMountLabel("mode=1777,size=65536k", container.GetMountLabel())); err != nil {
-		return fmt.Errorf("mounting shm tmpfs: %s", err)
-	}
-
-	mqueuePath, err := container.mqueuePath()
-	if err != nil {
-		return err
-	}
-
-	if err := os.MkdirAll(mqueuePath, 0700); err != nil {
-		return err
-	}
-
-	if err := syscall.Mount("mqueue", mqueuePath, "mqueue", uintptr(syscall.MS_NOEXEC|syscall.MS_NOSUID|syscall.MS_NODEV), ""); err != nil {
-		return fmt.Errorf("mounting mqueue mqueue : %s", err)
-	}
-
-	return nil
-}
-
-func (container *Container) unmountIpcMounts() error {
-	if container.hostConfig.IpcMode.IsContainer() || container.hostConfig.IpcMode.IsHost() {
-		return nil
-	}
-
-	shmPath, err := container.shmPath()
-	if err != nil {
-		return fmt.Errorf("shm path does not exist %v", err)
-	}
-
-	if err := syscall.Unmount(shmPath, syscall.MNT_DETACH); err != nil {
-		return fmt.Errorf("failed to umount %s filesystem %v", shmPath, err)
-	}
-
-	mqueuePath, err := container.mqueuePath()
-	if err != nil {
-		return fmt.Errorf("mqueue path does not exist %v", err)
-	}
-
-	if err := syscall.Unmount(mqueuePath, syscall.MNT_DETACH); err != nil {
-		return fmt.Errorf("failed to umount %s filesystem %v", mqueuePath, err)
-	}
-
-	return nil
-}
-
-func (container *Container) ipcMounts() []execdriver.Mount {
-	var mounts []execdriver.Mount
-	label.SetFileLabel(container.ShmPath, container.MountLabel)
-	mounts = append(mounts, execdriver.Mount{
-		Source:      container.ShmPath,
-		Destination: "/dev/shm",
-		Writable:    true,
-		Private:     true,
-	})
-	label.SetFileLabel(container.MqueuePath, container.MountLabel)
-	mounts = append(mounts, execdriver.Mount{
-		Source:      container.MqueuePath,
-		Destination: "/dev/mqueue",
-		Writable:    true,
-		Private:     true,
-	})
-	return mounts
-}

daemon/container_windows.go

@@ -172,15 +172,3 @@ func (container *Container) prepareMountPoints() error {
 func (container *Container) removeMountPoints() error {
 	return nil
 }
-
-func (container *Container) setupIpcDirs() error {
-	return nil
-}
-
-func (container *Container) unmountIpcMounts() error {
-	return nil
-}
-
-func (container *Container) ipcMounts() []execdriver.Mount {
-	return nil
-}

daemon/daemon.go

@@ -747,10 +747,6 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 		return nil, err
 	}
 
-	if err := d.cleanupMounts(); err != nil {
-		return nil, err
-	}
-
 	return d, nil
 }
 
@@ -826,10 +822,6 @@ func (daemon *Daemon) Shutdown() error {
 		}
 	}
 
-	if err := daemon.cleanupMounts(); err != nil {
-		return err
-	}
-
 	return nil
 }
 

daemon/daemon_linux.go

@@ -1,44 +0,0 @@
-package daemon
-
-import (
-	"bufio"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
-)
-
-// cleanupMounts umounts shm/mqueue mounts for old containers
-func (daemon *Daemon) cleanupMounts() error {
-	logrus.Debugf("Cleaning up old shm/mqueue mounts: start.")
-	f, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	sc := bufio.NewScanner(f)
-	for sc.Scan() {
-		line := sc.Text()
-		fields := strings.Split(line, " ")
-		if strings.HasPrefix(fields[4], daemon.repository) {
-			mnt := fields[4]
-			mountBase := filepath.Base(mnt)
-			if mountBase == "mqueue" || mountBase == "shm" {
-				logrus.Debugf("Unmounting %+v", mnt)
-				if err := mount.Unmount(mnt); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	if err := sc.Err(); err != nil {
-		return err
-	}
-
-	logrus.Debugf("Cleaning up old shm/mqueue mounts: done.")
-	return nil
-}

daemon/daemon_windows.go

@@ -138,7 +138,3 @@ func (daemon *Daemon) newBaseContainer(id string) Container {
 		},
 	}
 }
-
-func (daemon *Daemon) cleanupMounts() error {
-	return nil
-}

daemon/execdriver/native/template/default_template.go

@@ -61,6 +61,19 @@ func New() *configs.Config {
 				Flags:       syscall.MS_NOSUID | syscall.MS_NOEXEC,
 				Data:        "newinstance,ptmxmode=0666,mode=0620,gid=5",
 			},
+			{
+				Device:      "tmpfs",
+				Source:      "shm",
+				Destination: "/dev/shm",
+				Data:        "mode=1777,size=65536k",
+				Flags:       defaultMountFlags,
+			},
+			{
+				Source:      "mqueue",
+				Destination: "/dev/mqueue",
+				Device:      "mqueue",
+				Flags:       defaultMountFlags,
+			},
 			{
 				Source:      "sysfs",
 				Destination: "/sys",

integration-cli/docker_cli_run_test.go

@@ -1889,7 +1889,7 @@ func (s *DockerSuite) TestRunModeIpcHost(c *check.C) {
 func (s *DockerSuite) TestRunModeIpcContainer(c *check.C) {
 	testRequires(c, SameHostDaemon)
 
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && top")
+	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
 
 	id := strings.TrimSpace(out)
 	state, err := inspectField(id, "State.Running")
@@ -1910,11 +1910,6 @@ func (s *DockerSuite) TestRunModeIpcContainer(c *check.C) {
 	if parentContainerIpc != out {
 		c.Fatalf("IPC different with --ipc=container:%s %s != %s\n", id, parentContainerIpc, out)
 	}
-
-	catOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "cat", "/dev/shm/test")
-	if catOutput != "test" {
-		c.Fatalf("Output of /dev/shm/test expected test but found: %s", catOutput)
-	}
 }
 
 func (s *DockerSuite) TestRunModeIpcContainerNotExists(c *check.C) {