Skip to content
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

Fix how cgroup manager is created based on cgroups path #1288

Merged
merged 1 commit into from
Oct 21, 2022
Merged

Fix how cgroup manager is created based on cgroups path #1288

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
8 changes: 4 additions & 4 deletions crates/libcgroups/src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ pub fn create_cgroup_manager<P: Into<PathBuf>>(
match cgroup_setup {
CgroupSetup::Legacy | CgroupSetup::Hybrid => create_v1_cgroup_manager(cgroup_path),
CgroupSetup::Unified => {
if systemd_cgroup {
return create_systemd_cgroup_manager(cgroup_path, container_name);
// ref https://github.com/opencontainers/runtime-spec/blob/main/config-linux.md#cgroups-path
if cgroup_path.is_absolute() || !systemd_cgroup {
return create_v2_cgroup_manager(cgroup_path);
}

create_v2_cgroup_manager(cgroup_path)
create_systemd_cgroup_manager(cgroup_path, container_name)
}
}
}
Expand Down