Skip to content

Added cgroup type #324

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
Merged
mxpv merged 1 commit into from
Jan 28, 2024
Merged

Added cgroup type #324

mxpv merged 1 commit into from
Jan 28, 2024

Conversation

@yaoyinnan
Copy link
Contributor

@yaoyinnan yaoyinnan commented Jan 27, 2024

Add domain threaded and domain invalid cgroup type.

@yaoyinnan
Add cgroup type for cgroup v2
efd477f 
Add domain threaded and domain invalid cgroup type for cgroup v2.

Signed-off-by: yaoyinnan <35447132+yaoyinnan@users.noreply.github.com>
@yaoyinnan
Copy link
Contributor Author

yaoyinnan commented Jan 27, 2024

@dcantah @kzys Hi, can you review it for me? Thanks.

@mxpv mxpv merged commit 164a9a5 into containerd:main Jan 28, 2024
thaJeztah
thaJeztah reviewed Dec 4, 2024
View reviewed changes
cgroup2/manager.go
Comment on lines +245 to +248
Domain CgroupType = "domain"
DomainThreaded CgroupType = "domain threaded"
DomainInvalid CgroupType = "domain invalid"
Threaded CgroupType = "threaded"
Copy link
Member

@thaJeztah thaJeztah Dec 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yaoyinnan @dcantah @mxpv Wondering if additional changes were needed as part of this; I see Manager.Delete() has a special case for Threaded; should the same code be called when it encounters DomainThreaded ("domain threaded")?

cgroups/cgroup2/manager.go

Lines 479 to 490 in d4e976d

// Kernel prevents cgroups with running process from being removed,
// check the tree is empty.
//
// Pick the right file to read based on the cgs type.
cgType, err := c.GetType()
if err != nil {
if !os.IsNotExist(err) {
return err
}
} else {
threaded = cgType == Threaded
}

cgroups/cgroup2/manager.go

Lines 492 to 496 in d4e976d

if threaded {
tasks, err = c.Threads(true)
} else {
tasks, err = c.Procs(true)
}

code above was added in this PR;

This was referenced Dec 4, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah left review comments

@mxpv mxpv mxpv approved these changes

@dcantah dcantah dcantah approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@yaoyinnan @mxpv @thaJeztah @dcantah