Merge pull request #2748 from jpoimboe/fix-restart-race-condition

fix container restart race condition
This commit is contained in:
Victor Vieux 2013-11-19 16:26:13 -08:00
commit d575918038

View file

@ -1287,9 +1287,6 @@ func (container *Container) monitor() {
exitCode = container.cmd.ProcessState.Sys().(syscall.WaitStatus).ExitStatus()
}
// Report status back
container.State.setStopped(exitCode)
if container.runtime != nil && container.runtime.srv != nil {
container.runtime.srv.LogEvent("die", container.ID, container.runtime.repositories.ImageName(container.Image))
}
@ -1302,6 +1299,9 @@ func (container *Container) monitor() {
container.stdin, container.stdinPipe = io.Pipe()
}
// Report status back
container.State.setStopped(exitCode)
// Release the lock
close(container.waitLock)