containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5536 from giuseppe/avoid-conmon-zombie 

podman: avoid conmon zombie on exec
This commit is contained in:
OpenShift Merge Robot 2020-03-18 15:10:41 +01:00 committed by GitHub
parent f3a28de324 a6f5b6a485
commit f08b992f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/oci_conmon_linux.go
View File

@ -774,6 +774,10 @@ func (r *ConmonOCIRuntime) ExecContainer(c *Container, sessionID string, options
}() }()
attachToExecCalled = true attachToExecCalled = true
if err := execCmd.Wait(); err != nil {
return -1, nil, errors.Wrapf(err, "cannot run conmon")
}
pid, err := readConmonPipeData(parentSyncPipe, ociLog) pid, err := readConmonPipeData(parentSyncPipe, ociLog)
return pid, attachChan, err return pid, attachChan, err