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

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

Browse Source 
fix container restart race condition
Upstream-commit: d57591803847ea1492ee74cb1199407059ab6c63
Component: engine
This commit is contained in:
Victor Vieux
2013-11-19 16:26:13 -08:00
parent 267e312526 4d58ddf15b
commit 9670fcc04b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/container.go
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)