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

Wait for reexec to finish when fileOutput is nil #7292

Merged
merged 1 commit into from
Aug 18, 2020

Conversation

jdieter
Copy link
Contributor

@jdieter jdieter commented Aug 11, 2020

Currently, we're not cleaning up up after ourselves when fileOutput is nil. This patch fixes that.

if ret < 0 {
return false, -1, errors.New("error waiting for the re-exec process")
}

Copy link
Member

Choose a reason for hiding this comment

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

IDK, but will ask. We have a couple of other returns before the end of this function at lines 311 and 315. Do we need to call there too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we probably should. Can we defer a function that runs reexec_in_user_namespace_wait? Would there be a problem if we ran it against the same PID in rapid succession?

Copy link
Member

Choose a reason for hiding this comment

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

@jdieter if we did the defer, we'd need to capture the status of the call and return appropriately based on that. I'm not sure that's doable with defer, @mheon or @vrothberg might have some smarter thoughts on that or my question in general.

Copy link
Member

Choose a reason for hiding this comment

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

we could probably record the exit error and run it only when retErr != nil. What do you think?

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I'm not very proficient in Go, but tell me if my lastest push has what you're looking for. I've setup a deferred function that waits for the child if retErr != nil. I don't bother with the return value from reexec_in_user_namespace_wait because we presumably are more interested in passing whatever error is causing us to bail.

@rhatdan
Copy link
Member

rhatdan commented Aug 11, 2020

@giuseppe PTAL

Currently, we're not cleanup up after ourselves when fileOutput is nil.
This patch fixes that.

Signed-off-by: Jonathan Dieter <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Aug 17, 2020

@giuseppe PTAL

Copy link
Member

@giuseppe giuseppe 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-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, jdieter

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2020
@rhatdan
Copy link
Member

rhatdan commented Aug 18, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2020
@openshift-merge-robot openshift-merge-robot merged commit 49d6468 into containers:master Aug 18, 2020
@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 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants