瀏覽代碼

Merge pull request #23532 from swernli/exitCodeFix

Fixing exit code return on error case in Windows.
Tibor Vass 9 年之前
父節點
當前提交
a590a6b180
共有 1 個文件被更改,包括 4 次插入0 次删除
  1. 4 0
      libcontainerd/container_windows.go

+ 4 - 0
libcontainerd/container_windows.go

@@ -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.