summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-18 15:10:41 +0100
committerGitHub <noreply@github.com>2020-03-18 15:10:41 +0100
commitf08b992f3b1eccda7571a38caaa47ee52063db7a (patch)
treeb9de9d4d3e41f5670b655b5974deafb89a6d4462
parentf3a28de3249032e5d7be14114b126c7bddf3d479 (diff)
parenta6f5b6a4858f6a79265fa9447dfa73e8a2c1c3e8 (diff)
downloadpodman-f08b992f3b1eccda7571a38caaa47ee52063db7a.tar.gz
podman-f08b992f3b1eccda7571a38caaa47ee52063db7a.tar.bz2
podman-f08b992f3b1eccda7571a38caaa47ee52063db7a.zip
Merge pull request #5536 from giuseppe/avoid-conmon-zombie
podman: avoid conmon zombie on exec
-rw-r--r--libpod/oci_conmon_linux.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index a5530e448..d3c3bbcc5 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -774,6 +774,10 @@ func (r *ConmonOCIRuntime) ExecContainer(c *Container, sessionID string, options
}()
attachToExecCalled = true
+ if err := execCmd.Wait(); err != nil {
+ return -1, nil, errors.Wrapf(err, "cannot run conmon")
+ }
+
pid, err := readConmonPipeData(parentSyncPipe, ociLog)
return pid, attachChan, err