exec: get the exit code from sync pipe instead of file #5373
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
do-not-merge/work-in-progress
haircommander
force-pushed
the
exec-pipe-ec
branch
2 times, most recently
from
f1b0e33
to
edab75f
Compare
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: baude, haircommander The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
code lgtm |
|
This may cause issues with my detached exec code for APIv2 - how do we
source exit codes there?
…On Mon, Mar 2, 2020, 16:39 Brent Baude ***@***.***> wrote:
code lgtm
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#5373>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AB3AOCE5HNCF6RFLATOC23TRFQRP3ANCNFSM4K73IRNQ>
.
|
it would probably take an entirely different code path. We only wait on the exit code when we are attached to it. In updating the exec exit code (for an podman exec list or something, whatever the api will be for listing a container's exec session), we could check for the existence of the exit code via file. If need be, we could even save the pipe fd in the db or the location of the file, and open it as needed. This PR should fit right into your exec rework PR as is, and we can logic through how detach works with this when you get there. But for now this solves an immediate CI flake, so I'm inclined to go forward and think about reworks later. |
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>
haircommander
force-pushed
the
exec-pipe-ec
branch
from
edab75f
to
e4c89aa
Compare
Before, we were using -1 as a bogus value in podman to signify something went wrong when reading from a conmon pipe. However, conmon uses negative values to indicate the runtime failed, and return the runtime's exit code. instead, we should use a bogus value that is actually bogus. Define that value in the define package as MinInt32 (-1<< 31 - 1), which is outside of the range of possible pids (-1 << 31) Signed-off-by: Peter Hunt <pehunt@redhat.com>
haircommander
force-pushed
the
exec-pipe-ec
branch
from
e4c89aa
to
d3d97a2
Compare
haircommander
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
This is ready |
|
LGTM |
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
/lgtm |
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
mheon
added a commit
to mheon/libpod
that referenced
this pull request
Mar 9, 2020
This reverts commit 4632b81. We are reverting containers#5373 as well, which lays the foundation for this commit, so it has to go as well. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Merged
snj33v
pushed a commit
to snj33v/libpod
that referenced
this pull request
May 31, 2020
This reverts commit 4632b81. We are reverting containers#5373 as well, which lays the foundation for this commit, so it has to go as well. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
Also slightly change the way we report a bogus value when failing to read from the conmon pipe. we now set it to a value that cannot be a valid pid * -1, to make sure we correctly report the place an error comes from
Signed-off-by: Peter Hunt pehunt@redhat.com