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

Merge pull request #23009 from Microsoft/WindowsLeakedHandle

Browse source 
Fix a leaked process handle of the first container to start on Windows
This commit is contained in:
Alexander Morozov 2016-05-26 14:39:57 -07:00
commit 11ddfa4b2b
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libcontainerd/container_windows.go
View file

@ -167,6 +167,10 @@ func (ctr *container) waitExit(process *process, isFirstProcessToStart bool) err
// has exited to avoid a container being dropped on the floor.
}
if err := process.hcsProcess.Close(); err != nil {
logrus.Error(err)
}
// Assume the container has exited
si := StateInfo{
CommonStateInfo: CommonStateInfo{
@ -180,9 +184,6 @@ func (ctr *container) waitExit(process *process, isFirstProcessToStart bool) err
// But it could have been an exec'd process which exited
if !isFirstProcessToStart {
if err := process.hcsProcess.Close(); err != nil {
logrus.Error(err)
}
si.State = StateExitProcess
} else {
updatePending, err := ctr.hcsContainer.HasPendingUpdates()