GitList

Browse code

add wait4 after kill

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Victor Vieux authored on 2014/06/06 09:32:14
Showing 1 changed files

daemon/execdriver/native/driver.go index 41121a7..d3805b4 100644

@@ -187,6 +187,7 @@ func (d *driver) Terminate(p *execdriver.Command) error {
 	}
 	if started == currentStartTime {
 		err = syscall.Kill(p.Process.Pid, 9)
+		syscall.Wait4(p.Process.Pid, nil, 0, nil)
 	}
 	d.removeContainerRoot(p.ID)
 	return err

...	...	@@ -187,6 +187,7 @@ func (d driver) Terminate(p execdriver.Command) error {
187	187	}
188	188	if started == currentStartTime {
189	189	err = syscall.Kill(p.Process.Pid, 9)
	190	+ syscall.Wait4(p.Process.Pid, nil, 0, nil)
190	191	}
191	192	d.removeContainerRoot(p.ID)
192	193	return err