Skip to content

runsc: Auto-enable systemd cgroup handling for systemd paths #13384

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

Open
anishesg wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

runsc: Auto-enable systemd cgroup handling for systemd paths #13384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions runsc/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1893,15 +1893,24 @@ func (c *Container) populateStats(event *boot.EventOut) {

func (c *Container) createParentCgroup(parentPath string, conf *config.Config) (cgroup.Cgroup, error) {
var err error
useSystemd := conf.SystemdCgroup
if conf.SystemdCgroup {
parentPath, err = cgroup.TransformSystemdPath(parentPath, c.ID, conf.Rootless)
if err != nil {
return nil, err
}
} else if cgroup.LikelySystemdPath(parentPath) {
log.Warningf("cgroup parent path is set to %q which looks like a systemd path. Please set --systemd-cgroup=true if you intend to use systemd to manage container cgroups", parentPath)
// Auto-enable systemd cgroup handling when a systemd path is detected.
// This ensures proper cgroup initialization when the shim is invoked
// directly with systemd paths (e.g., via Docker's --runtime flag).
log.Infof("Detected systemd cgroup path %q, enabling systemd cgroup handling", parentPath)
useSystemd = true
parentPath, err = cgroup.TransformSystemdPath(parentPath, c.ID, conf.Rootless)
if err != nil {
return nil, err
}
}
parentCgroup, err := cgroup.NewFromPath(parentPath, conf.SystemdCgroup)
parentCgroup, err := cgroup.NewFromPath(parentPath, useSystemd)
if err != nil {
return nil, err
}
Expand Down