From 44cd599e29451647492b3a5341ba23252a69ca27 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 4 May 2015 13:49:28 -0400 Subject: [PATCH] Cleanup container reg for lxc special case The lxc code here is doing the exact same thing on calling execdriver.Terminate, so let's just use that. Also removes some dead comments originally introduced 50144aeb42283848db730b936d6b5b6332ec6565 but no longer relevant since we have restart policies. Signed-off-by: Brian Goff --- daemon/daemon.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 130fcc46f2..26dbd50e34 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -22,7 +22,6 @@ import ( "github.com/docker/docker/daemon/events" "github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver/execdrivers" - "github.com/docker/docker/daemon/execdriver/lxc" "github.com/docker/docker/daemon/graphdriver" _ "github.com/docker/docker/daemon/graphdriver/vfs" "github.com/docker/docker/daemon/network" @@ -208,25 +207,16 @@ func (daemon *Daemon) register(container *Container, updateSuffixarray bool) err container.registerVolumes() - // FIXME: if the container is supposed to be running but is not, auto restart it? - // if so, then we need to restart monitor and init a new lock - // If the container is supposed to be running, make sure of it if container.IsRunning() { logrus.Debugf("killing old running container %s", container.ID) container.SetStopped(&execdriver.ExitStatus{ExitCode: 0}) - // We only have to handle this for lxc because the other drivers will ensure that - // no processes are left when docker dies - if container.ExecDriver == "" || strings.Contains(container.ExecDriver, "lxc") { - lxc.KillLxc(container.ID, 9) - } else { - // use the current driver and ensure that the container is dead x.x - cmd := &execdriver.Command{ - ID: container.ID, - } - daemon.execDriver.Terminate(cmd) + // use the current driver and ensure that the container is dead x.x + cmd := &execdriver.Command{ + ID: container.ID, } + daemon.execDriver.Terminate(cmd) if err := container.Unmount(); err != nil { logrus.Debugf("unmount error %s", err)