-
Notifications
You must be signed in to change notification settings - Fork 2.9k
CGgroups v1 cleanup: Round 2 w/ container-libs vendoring #27551
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
base: main
Are you sure you want to change the base?
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lsm5 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 |
|
Depends on containers/container-libs#464 |
64c886a to
2b337bb
Compare
|
|
2b337bb to
7da1bc6
Compare
| _, err := cgroups.New(cgroupPath, &cgroupResources) | ||
| if err != nil { | ||
| logrus.StandardLogger().Logf(logLevel, "Failed to add conmon to cgroupfs sandbox cgroup: %v", err) | ||
| } else if err := control.AddPid(cmd.Process.Pid); err != nil { |
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.
Is removing this correct? (I have no idea.)
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.
@containers/podman-maintainers wdyt? This is only in the case when cgroups manager isn't systemd which (IIRC) is safe to remove. Also, no tests failed with this removal fwiw. So if it is needed at all, do we need a test for this case too?
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.
no, we still support cgroupfs. We need this call to move the process to the target cgroup
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.
ack, got it. I'll revise. Thanks!
df346e1 to
c1a613b
Compare
This reverts commit cce5ec8. Note: This has already gone through a revert and re-revert cycle in commits 5273685 and 3fe402b, but that's wrong per: containers/podman#27551 (comment) . Signed-off-by: Lokesh Mandvekar <[email protected]>
c1a613b to
b25b3f7
Compare
Signed-off-by: Lokesh Mandvekar <[email protected]>
b25b3f7 to
059964e
Compare
|
[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore. |
Checklist
Ensure you have completed the following checklist for your pull request to be reviewed:
commits. (
git commit -s). (If needed, usegit commit -s --amend). The author email must matchthe sign-off email address. See CONTRIBUTING.md
for more information.
Fixes: #00000in commit message (if applicable)make validatepr(format/lint checks)Noneif no user-facing changes)Does this PR introduce a user-facing change?