Merge pull request moby#17180 from rhatdan/destroy

cpuguy83 · cpuguy83 · commit 5087e8c2e86b · 2015-10-26T15:48:04.000-04:00
Docker is calling cont.Destroy twice on success
diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go
@@ -132,6 +132,7 @@ type execOutput struct {
 // Run implements the exec driver Driver interface,
 // it calls libcontainer APIs to run a container.
 func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execdriver.Hooks) (execdriver.ExitStatus, error) {
+	destroyed := false
 	// take the Command and populate the libcontainer.Config from it
 	container, err := d.createContainer(c, hooks)
 	if err != nil {
@@ -157,7 +158,9 @@ func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execd
 	d.activeContainers[c.ID] = cont
 	d.Unlock()
 	defer func() {
-		cont.Destroy()
+		if !destroyed {
+			cont.Destroy()
+		}
 		d.cleanContainer(c.ID)
 	}()
 
@@ -191,6 +194,7 @@ func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execd
 		ps = execErr.ProcessState
 	}
 	cont.Destroy()
+	destroyed = true
 	_, oomKill := <-oom
 	return execdriver.ExitStatus{ExitCode: utils.ExitStatus(ps.Sys().(syscall.WaitStatus)), OOMKilled: oomKill}, nil
 }
