-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
exec: fix error code when conmon fails #5396
exec: fix error code when conmon fails #5396
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, rhatdan 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 |
libpod/container_api.go
Outdated
@@ -341,6 +341,10 @@ func (c *Container) Exec(tty, privileged bool, env map[string]string, cmd []stri | |||
logrus.Errorf(lastErr.Error()) | |||
} | |||
lastErr = errors.Wrapf(define.ErrOCIRuntime, "non zero exit code: %d", exitCodeData.data) | |||
// if we failed in podman, set the exit code to a generic error |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"if we failed in podman"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated the comment to be more informative
LGTM but I'm not qualified to understand the whole subcontext here; nor do I have a reliable way to reproduce this. |
I spoke too soon: we do have a way to test this: CI:
I was expecting this PR to change this message? |
29065d8
to
4bed422
Compare
uh yeah I would expect the message to change too, but I clobbered CI with a force push. Time to wait for another failure 😓 |
Did you mean to check in the And, I misspoke, I wouldn't expect the message to change since the assignment happens after the message. I'm not sure I understand how this helps... |
4bed422
to
af32821
Compare
this is a cosmetic change that makes sure podman returns a sane error code when conmon dies underneath it Signed-off-by: Peter Hunt <[email protected]>
af32821
to
4632b81
Compare
jeez it must be the end of the day.... thanks for your hand holding, I dropped the .lock file and updated the location to make it actually work.. |
/hold (pending tests working) |
Looks better:
Failures restarted, even though one of them is new to me. I'll just treat it as a flake and worry about it later if it recurs.
|
/hold cancel |
Why isn't this automerging? |
this is a cosmetic change that makes sure podman returns a sane error code when conmon dies underneath it
fixes the weirdness in this comment: #5339 (comment)
but unfortunately not the underlying problem.
Signed-off-by: Peter Hunt [email protected]