cg2: Don't read cgroup.procs when deleting threaded cg#318
Merged
fuweid merged 1 commit intocontainerd:mainfrom Jan 24, 2024
Merged
cg2: Don't read cgroup.procs when deleting threaded cg#318fuweid merged 1 commit intocontainerd:mainfrom
fuweid merged 1 commit intocontainerd:mainfrom
Conversation
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. Signed-off-by: Danny Canter <[email protected]>
cpuguy83
reviewed
Jan 16, 2024
| if len(processes) > 0 { | ||
| return fmt.Errorf("cgroups: unable to remove path %q: still contains running processes", c.path) | ||
| if len(tasks) > 0 { | ||
| return fmt.Errorf("cgroups: unable to remove path %q: still contains running tasks", c.path) |
Member
There was a problem hiding this comment.
Curious why we don't try to remove and check for EBSUY instead?
Member
Author
There was a problem hiding this comment.
I think, and this is for what was here today, it's mainly for a nice error so I tried to keep in line with what was here already. I suppose we could just immediately remove(c.path) (which tries to handle a reasonable amount of ebusy looping) although afterwards we'd still need to know what file to read to surface some decent error if the remove didn't go through.
dmcgowan
approved these changes
Jan 17, 2024
cpuguy83
approved these changes
Jan 17, 2024
Member
Author
|
@dmcgowan This should be ready to check in, didn't realize I got two 😆 |
fuweid
approved these changes
Jan 24, 2024
This was referenced Dec 4, 2024
Merged
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
4 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.
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.