kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #4633 from crosbymichael/no-pid-kill 

Don't kill by pid for other drivers
This commit is contained in:
Victor Vieux 2014-03-13 17:31:37 -07:00
parent c0cef47b1e 3fa99b35b0
commit 400ae98d23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/runtime.go
View File

@ -160,22 +160,16 @@ func (runtime *Runtime) Register(container *Container) error {
if container.State.IsGhost() { if container.State.IsGhost() {
utils.Debugf("killing ghost %s", container.ID) utils.Debugf("killing ghost %s", container.ID)
existingPid := container.State.Pid
container.State.SetGhost(false) container.State.SetGhost(false)
container.State.SetStopped(0) container.State.SetStopped(0)
// We only have to handle this for lxc because the other drivers will ensure that
// no ghost processes are left when docker dies
if container.ExecDriver == "" || strings.Contains(container.ExecDriver, "lxc") { if container.ExecDriver == "" || strings.Contains(container.ExecDriver, "lxc") {
lxc.KillLxc(container.ID, 9) lxc.KillLxc(container.ID, 9)
} else { if err := container.Unmount(); err != nil {
command := &execdriver.Command{ utils.Debugf("ghost unmount error %s", err)
ID: container.ID,
} }
command.Process = &os.Process{Pid: existingPid}
runtime.execDriver.Kill(command, 9)
}
// ensure that the filesystem is also unmounted
if err := container.Unmount(); err != nil {
utils.Debugf("ghost unmount error %s", err)
} }
} }