clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 05:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add unit test for hanging kill + fix other tests behaviour

Browse Source
This commit is contained in:
Guillaume J. Charmes
2013-04-11 16:21:19 -07:00
parent e68c04b722
commit bb22cd492e
4 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
container.go
+3 -3
View File
@@ -551,15 +551,15 @@ func (container *Container) kill() error {
return nil
}
// Sending SIGINT to the process via lxc
// Sending SIGKILL 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)
log.Printf("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)
log.Printf("Container %s failed to exit within 10 seconds of lxc SIGKILL - trying direct SIGKILL", container.Id)
if err := container.cmd.Process.Kill(); err != nil {
return err
}