p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force kill now use lxc-kill. Fixes #383

Browse Source 
Upstream-commit: e68c04b722b4c001c999abc2cd5b60b1f1b34457
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-04-11 09:02:34 -07:00
parent 2bb40279d3
commit 46c83a02af
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/engine/container.go
View File

@ -550,9 +550,21 @@ func (container *Container) kill() error {
if !container.State.Running || container.cmd == nil {
return nil
}
if err := container.cmd.Process.Kill(); err != nil {
return err
// Sending SIGINT to the process via lxc
output, err := exec.Command("lxc-kill", "-n", container.Id, "9").CombinedOutput()
if err != nil {
Debugf("error killing container %s (%s, %s)", container.Id, output, err)
}
// 2. Wait for the process to die, in last resort, try to kill the process directly
if err := container.WaitTimeout(10 * time.Second); err != nil {
log.Printf("Container %s failed to exit within 10 seconds of SIGINT - trying direct SIGKILL", container.Id)
if err := container.cmd.Process.Kill(); err != nil {
return err
}
}
// Wait for the container to be actually stopped
container.Wait()
return nil