Merge pull request #6030 from erikh/5971-fix-zombies

Add Wait() calls in the appropriate spots

daemon/container.go

@@ -584,6 +584,7 @@ func (container *Container) Stop(seconds int) error {
 		log.Printf("Container %v failed to exit within %d seconds of SIGTERM - using the force", container.ID, seconds)
 		// 3. If it doesn't, then send SIGKILL
 		if err := container.Kill(); err != nil {
+			container.Wait()
 			return err
 		}
 	}

daemon/execdriver/lxc/driver.go

@@ -181,6 +181,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 	if err != nil {
 		if c.Process != nil {
 			c.Process.Kill()
+			c.Process.Wait()
 		}
 		return -1, err
 	}

pkg/libcontainer/nsinit/exec.go

@@ -40,6 +40,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
 	}
 
 	command := createCommand(container, console, rootfs, dataPath, os.Args[0], syncPipe.child, args)
+
 	if err := term.Attach(command); err != nil {
 		return -1, err
 	}
@@ -55,6 +56,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
 	}
 	if err := WritePid(dataPath, command.Process.Pid, started); err != nil {
 		command.Process.Kill()
+		command.Process.Wait()
 		return -1, err
 	}
 	defer DeletePid(dataPath)
@@ -64,6 +66,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
 	cleaner, err := SetupCgroups(container, command.Process.Pid)
 	if err != nil {
 		command.Process.Kill()
+		command.Process.Wait()
 		return -1, err
 	}
 	if cleaner != nil {
@@ -72,6 +75,7 @@ func Exec(container *libcontainer.Container, term Terminal, rootfs, dataPath str
 
 	if err := InitializeNetworking(container, command.Process.Pid, syncPipe); err != nil {
 		command.Process.Kill()
+		command.Process.Wait()
 		return -1, err
 	}
 

pkg/libcontainer/nsinit/init.go

@@ -126,7 +126,9 @@ func RestoreParentDeathSignal(old int) error {
 	// Signal self if parent is already dead. Does nothing if running in a new
 	// PID namespace, as Getppid will always return 0.
 	if syscall.Getppid() == 1 {
-		return syscall.Kill(syscall.Getpid(), syscall.Signal(old))
+		err := syscall.Kill(syscall.Getpid(), syscall.Signal(old))
+		syscall.Wait4(syscall.Getpid(), nil, 0, nil)
+		return err
 	}
 
 	return nil

pkg/libcontainer/nsinit/tty_term.go

@@ -28,10 +28,11 @@ func (t *TtyTerminal) Attach(command *exec.Cmd) error {
 	go io.Copy(t.master, t.stdin)
 
 	state, err := t.setupWindow(t.master, os.Stdin)
+
 	if err != nil {
-		command.Process.Kill()
 		return err
 	}
+
 	t.state = state
 	return err
 }