Skip to content
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

remote wait: fix "removed" condition #18912

Merged
merged 1 commit into from
Jun 16, 2023

Conversation

vrothberg
Copy link
Member

The "removed" condition mapped to an undefined state which ultimately rendered the wait endpoint to return an incorrect exit code. Instead, map "removed" to "exited" to make sure Podman returns the expected exit code.

Fixes: #18889

Does this PR introduce a user-facing change?

Fix a bug in the wait endpoint of the compat API to correctly handle the "removed" condition.

@vrothberg vrothberg marked this pull request as ready for review June 16, 2023 09:23
@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Jun 16, 2023
@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 16, 2023
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not so sure about this, I would assume to have removed wait for the container to be removed not only exited.

@vrothberg
Copy link
Member Author

I am not so sure about this, I would assume to have removed wait for the container to be removed not only exited.

Very fair point. I was totally focused on the exit code. I'll extend the code and tests.

The "removed" condition mapped to an undefined state which ultimately
rendered the wait endpoint to return an incorrect exit code.  Instead,
map "removed" to "exited" to make sure Podman returns the expected
exit code.

Fixes: containers#18889
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
@vrothberg
Copy link
Member Author

@Luap99 PTanotherL. It looks a bit clunky but the entire compat wait code is one big spaghetti and I refrained from rewriting it.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vrothberg
Copy link
Member Author

@flouthoc @giuseppe PTAL

Copy link
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, vrothberg

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@vrothberg
Copy link
Member Author

Ready to merge

@Luap99
Copy link
Member

Luap99 commented Jun 16, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2023
@vrothberg
Copy link
Member Author

/hold cancel

@vrothberg vrothberg removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 16, 2023
@openshift-merge-robot openshift-merge-robot merged commit ea5cf4c into containers:main Jun 16, 2023
87 checks passed
@vrothberg vrothberg deleted the fix-18889 branch June 16, 2023 12:09
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 15, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman service: inconsistent exit code when called from docker
4 participants