diff options
| author | Peter Hunt <pehunt@redhat.com> | 2020-03-02 14:42:48 -0500 |
|---|---|---|
| committer | Peter Hunt <pehunt@redhat.com> | 2020-03-03 15:35:35 -0500 |
| commit | 4b72f9e4013411208751df2a92ab9f322d4da5b2 (patch) | |
| tree | 21abdfa291eaca2da67b0115fa4eed93eaa5aaa7 /libpod/oci_attach_linux.go | |
| parent | 3bc5f431d4df9724501a42a68e333f7e98a0b0cf (diff) | |
| download | podman-4b72f9e4013411208751df2a92ab9f322d4da5b2.tar.gz podman-4b72f9e4013411208751df2a92ab9f322d4da5b2.tar.bz2 podman-4b72f9e4013411208751df2a92ab9f322d4da5b2.zip | |
exec: get the exit code from sync pipe instead of file
Before, we were getting the exit code from the file, in which we waited an arbitrary amount of time (5 seconds) for the file, and segfaulted if we didn't find it. instead, we should be a bit more certain conmon has sent the exit code. Luckily, it sends the exit code along the sync pipe fd, so we can read it from there
Adapt the ExecContainer interface to pass along a channel to get the pid and exit code from conmon, to be able to read both from the pipe
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 46c70e7eb..5a8198d05 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -119,8 +119,8 @@ func (c *Container) attachToExec(streams *AttachStreams, keys string, resize <-c socketPath := buildSocketPath(sockPath) // 2: read from attachFd that the parent process has set up the console socket - if _, err := readConmonPipeData(attachFd, ""); err != nil { - return err + if pipeData := readConmonPipeData(attachFd, ""); pipeData.err != nil { + return pipeData.err } // 2: then attach |