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.

Sign up for GitHub

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

Jump to bottom

cgroup: fix rootless --cgroup-parent with pods #10234

Merged
merged 1 commit into from
May 6, 2021
Merged

cgroup: fix rootless --cgroup-parent with pods #10234

merged 1 commit into from
May 6, 2021

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented May 5, 2021 •
edited by edsantiago
Loading

extend to pods the existing check whether the cgroup is usable when
running as rootless with cgroupfs.

commit 17ce567 introduced the
regression.

[NO TESTS NEEDED] -- we already have tests, they're just not being run. #10237 hopes to fix that.

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

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 5, 2021
@openshift-ci-robot
Copy link
Collaborator

[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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2021
@edsantiago
Copy link
Member

Needs a test, please. Unfortunately, IIUC, this only happens on rootless + cgroups v1 + runc? If that's true, then we're in trouble because we don't test that in CI.

@containers/podman-maintainers can we add Prior-ubuntu + rootless to our CI matrix? I do not ask this lightly: I ask because that's the only way we can catch RHEL problems early.

@rhatdan
Copy link
Member

rhatdan commented May 5, 2021

SGTM

@edsantiago edsantiago mentioned this pull request May 5, 2021
Merged
@edsantiago
Copy link
Member

@giuseppe please re-push (maybe with a whitespace-only change to the commit message). I've edited the github description to include the magic [NO TESTS NEEDED] string, and as soon as this merges I will follow up with #10237 to make sure this doesn't happen again.

@giuseppe
cgroup: fix rootless --cgroup-parent with pods
27ac750 
extend to pods the existing check whether the cgroup is usable when
running as rootless with cgroupfs.

commit 17ce567 introduced the
regression.

Signed-off-by: Giuseppe Scrivano <[email protected]>
@giuseppe giuseppe force-pushed the fix-cgroupfs-pod branch from 7370285 to 27ac750 Compare May 6, 2021 06:33
@giuseppe
Copy link
Member Author

giuseppe commented May 6, 2021

Needs a test, please. Unfortunately, IIUC, this only happens on rootless + cgroups v1 + runc? If that's true, then we're in trouble because we don't test that in CI.

in this case I like more the runc behavior. If the path is explicitly set in the configuration file (as Podman did before this PR), then the error should not be ignored even in rootless mode on cgroup v1. I've opened a PR for crun to fix it: containers/crun#658

@edsantiago
Copy link
Member

LGTM. Tests are passing in #10237, which I rebased onto this PR (they failed catastrophically before I rebased). @containers/podman-maintainers PTAL and let's get this in ASAP.

@giuseppe giuseppe marked this pull request as ready for review May 6, 2021 12:28
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 6, 2021
@mheon
Copy link
Member

mheon commented May 6, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 6, 2021
@openshift-merge-robot openshift-merge-robot merged commit 176ae99 into containers:master May 6, 2021
edsantiago added a commit to edsantiago/libpod that referenced this pull request May 6, 2021
@edsantiago
CI: run rootless tests under ubuntu
95a50a9 
Reason: to catch errors before they surface in RHEL.

One of the Ubuntus is specially crafted to run with cgroups v1
and runc. Although this isn't quite the same as RHEL, it's as
close as we can come in our CI environment, and I suspect it
would have caught containers#10234 (a regression).

Sorry, team.

Also: play kube limits test: skip on all rootless, not just
rootless+fedora. There was a complicated and unnecessary
check in there for Fedora.

Also: workaround for bug containers#10248, a spurious error message on
the first invocation of rootless podman on Ubuntu.Old

Signed-off-by: Ed Santiago <[email protected]>
@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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@mheon mheon

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@giuseppe @openshift-ci-robot @edsantiago @rhatdan @mheon @openshift-merge-robot