beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #23532 from swernli/exitCodeFix

Browse source 
Fixing exit code return on error case in Windows.
This commit is contained in:
Tibor Vass 2016-06-16 19:01:18 -07:00 committed by GitHub
commit a590a6b180
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcontainerd/container_windows.go
View file

@ -175,6 +175,10 @@ func (ctr *container) waitProcessExitCode(process *process) int {
if herr, ok := err.(*hcsshim.ProcessError); ok && herr.Err != syscall.ERROR_BROKEN_PIPE {
logrus.Warnf("Unable to get exit code from container %s", ctr.containerID)
}
// Since we got an error retrieving the exit code, make sure that the code we return
// doesn't incorrectly indicate success.
exitCode = -1
// Fall through here, do not return. This ensures we attempt to continue the
// shutdown in HCS and tell the docker engine that the process/container
// has exited to avoid a container being dropped on the floor.