cgroup2: Manager.Delete: handle both "threaded" and "domain threaded"#358
Merged
fuweid merged 1 commit intocontainerd:mainfrom Dec 17, 2024
Merged
Conversation
commit 6f5001d added special handling for threaded cgroup types. A later contribution added detection for "domain threaded" as known type, but did not update the handling to detect this type. From the original PR; > Reading cgroup.procs seems to return ENOTSUPP when threaded, so check > the type of the cg when going to delete and read the relevant file. An alternative could be to check both variants unconditionally, and to error if either Manager.Threads or Manager.Procs is non-zero. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
commented
Dec 10, 2024
Comment on lines
+488
to
491
| case Threaded, DomainThreaded: | ||
| tasks, err = c.Threads(true) | ||
| } else { | ||
| default: | ||
| tasks, err = c.Procs(true) |
Member
Author
There was a problem hiding this comment.
Alternative could be to just to try either if we get anything in return?
if tasks, _ := c.Threads(true); len(tasks) > 0 {
return fmt.Errorf("cgroups: unable to remove path %q: still contains running tasks", c.path)
}
if tasks, _ := c.Procs(true); len(tasks) > 0 {
return fmt.Errorf("cgroups: unable to remove path %q: still contains running tasks", c.path)
}
Member
Author
There was a problem hiding this comment.
oh, not sure if that makes sense. Looking at Procs and Threads, they both call getTasks under the hood; if the above does make sense, I guess that function could possibly accept both cgroupProcs and cgroupThreads to get "any".
2 tasks
dcantah
approved these changes
Dec 15, 2024
fuweid
approved these changes
Dec 17, 2024
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
commit 6f5001d added special handling for threaded cgroup types. A later contribution added detection for "domain threaded" as known type, but did not update the handling to detect this type.
From the original PR;
An alternative could be to check both variants unconditionally, and to error if either Manager.Threads or Manager.Procs is non-zero.