[1.0] Remove sub cgroup when container exits #3297
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, we can create subcgroup in a rootless container with systemd cgroupv2 on centos8. But after the container exited, the container cgroup and its subcgroup will not be removed. Fix this by removing all directories recursively. Fixes: opencontainers#3225 Signed-off-by: Kang Chen <kongchen28@gmail.com> [kolyshkin: cherry picked from commit 7758d3f, changing the code to use cgroups.RemovePath().] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Closed
AkihiroSuda
approved these changes
Nov 30, 2021
thaJeztah
approved these changes
Nov 30, 2021
| // XXX this is probably not needed, systemd should handle it | ||
| err := os.Remove(m.path) | ||
| if err != nil && !os.IsNotExist(err) { | ||
| // systemd 239 do not remove sub-cgroups. |
There was a problem hiding this comment.
Suggested change
| // systemd 239 do not remove sub-cgroups. | |
| // systemd 239 does not remove sub-cgroups. |
Comment on lines
+310
to
+312
| err := cgroups.RemovePath(m.path) | ||
| // cgroups.RemovePath has handled ErrNotExist | ||
| if err != nil { |
There was a problem hiding this comment.
Hm.. didn't notice this when reviewing #3226 but, given that this is the last code of the function, looks like we could just return cgroups.RemovePath(m.path) here.
No need to change, as this more closely matches what's in main (but we could clean that up)
|
(I see you also requested a review from @cyphar, but feel free to merge if that was just "one of you both" 😅) |
|
Both suggestions from @thaJeztah are valid, I guess it makes sense to fix them in main branch. Here, not so much, as this is a release branch that will be hopefully be closed some time after we release 1.1. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of #3226 to release-1.0 branch, fixing issue #3225.
Note it's not a clean backport as 1.0 lacks fsMgr field, and we do not want to instantiate one, so the commit was changed:
Proposed changelog entry