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

rootless: fix fast join userns path #10611

Merged

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Jun 9, 2021

commit ab88632 changed the path for
the pause.pid file but didn't update the same path in the C code.
This prevented Podman to take the fast path when the userns is already
created and to join it without re-execing itself.

Fix the path in the C code as well so we can join the rootless
user+mount namespace without having to re-exec Podman.

[NO TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano [email protected]

commit ab88632 changed the path for
the pause.pid file but didn't update the same path in the C code.
This prevented Podman to take the fast path when the userns is already
created and to join it without re-execing itself.

Fix the path in the C code as well so we can join the rootless
user+mount namespace without having to re-exec Podman.

[NO TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2021
@rhatdan
Copy link
Member

rhatdan commented Jun 9, 2021

LGTM
@mheon PTAL

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@mheon
Copy link
Member

mheon commented Jun 9, 2021

/lgtm
/hold

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jun 9, 2021
@vrothberg
Copy link
Member

vrothberg commented Jun 9, 2021

A quick test locally with:

for i in {1..20}
do
        $PODMAN run -d alpine ls
done

Ran three times each:
Before the commit > 8 secs
After the commits <= 7 secs

By no means a meaningful benchmark but we may consider backporting that to 3.0 and 3.1 branches.

@giuseppe
Copy link
Member Author

giuseppe commented Jun 9, 2021

tests got stuck.

/retest

@giuseppe
Copy link
Member Author

giuseppe commented Jun 9, 2021

@cevich do I need to re-push?

@giuseppe giuseppe closed this Jun 9, 2021
@giuseppe giuseppe reopened this Jun 9, 2021
@cevich
Copy link
Member

cevich commented Jun 9, 2021

tests got stuck.

They look okay to me (now). Perhaps github was showing broken re-run status but Cirrus was still executing?

@giuseppe
Copy link
Member Author

I've closed the PR and opened it again :) That seemed to unblock the CI.

All green now!

@vrothberg PTAL

@giuseppe
Copy link
Member Author

@vrothberg unping, sorry, I've not seen there are already two LGTM

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 10, 2021
@openshift-merge-robot openshift-merge-robot merged commit d116beb into containers:master Jun 10, 2021
@giuseppe
Copy link
Member Author

some backports:

#10630
#10631
#10632
#10633

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