clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure state is destroyed on daemont restart

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2015-04-15 17:44:03 -07:00
parent 0c7b51089c
commit a5f7c4aa31
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/execdriver/native/driver.go
+5 -9
View File
@@ -268,29 +268,25 @@ func (d *driver) Unpause(c *execdriver.Command) error {
func (d *driver) Terminate(c *execdriver.Command) error {
defer d.cleanContainer(c.ID)
// lets check the start time for the process
active := d.activeContainers[c.ID]
if active == nil {
return fmt.Errorf("active container for %s does not exist", c.ID)
container, err := d.factory.Load(c.ID)
if err != nil {
return err
}
state, err := active.State()
defer container.Destroy()
state, err := container.State()
if err != nil {
return err
}
pid := state.InitProcessPid
currentStartTime, err := system.GetProcessStartTime(pid)
if err != nil {
return err
}
if state.InitProcessStartTime == currentStartTime {
err = syscall.Kill(pid, 9)
syscall.Wait4(pid, nil, 0, nil)
}
return err
}
func (d *driver) Info(id string) execdriver.Info {