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

Merge pull request #25777 from swernli/servicing_race

Browse source 
Fixing race in Windows container servicing
This commit is contained in:
Brian Goff 2016-09-08 10:42:15 -04:00 committed by GitHub
commit 4219c0018f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcontainerd/container_windows.go
View file

@ -95,7 +95,7 @@ func (ctr *container) start() error {
ctr.process.hcsProcess = hcsProcess ctr.process.hcsProcess = hcsProcess
// If this is a servicing container, wait on the process synchronously here and // If this is a servicing container, wait on the process synchronously here and
// immediately call shutdown/terminate when it returns. // if it succeeds, wait for it cleanly shutdown and merge into the parent container.
if isServicing { if isServicing {
exitCode := ctr.waitProcessExitCode(&ctr.process) exitCode := ctr.waitProcessExitCode(&ctr.process)
@ -104,7 +104,7 @@ func (ctr *container) start() error {
return ctr.terminate() return ctr.terminate()
} }
return ctr.shutdown() return ctr.hcsContainer.WaitTimeout(time.Minute * 5)
} }
var stdout, stderr io.ReadCloser var stdout, stderr io.ReadCloser