mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-23 09:21:57 +01:00
Code Issues

Cleanup

Browse Source
This commit is contained in:
Furisto 2021-11-24 19:42:21 +01:00
parent 419284137e
commit 9cff02435b
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/libcgroups/src/common.rs
View File

@ -176,10 +176,6 @@ pub fn create_cgroup_manager<P: Into<PathBuf>>(
match cgroup_setup {
CgroupSetup::Legacy | CgroupSetup::Hybrid => {
if systemd_cgroup {
bail!("resource control with systemd is not supported on cgroup v1");
}
log::info!("cgroup manager V1 will be used");
Ok(Box::new(v1::manager::Manager::new(cgroup_path.into())?))
}

4
crates/libcgroups/src/systemd/dbus/client.rs
View File

@ -174,7 +174,7 @@ impl SystemdClient for Client {
let cgroup_root = proxy
.control_group()
.context("failed to get systemd control group")?;
PathBuf::try_from(cgroup_root)
.with_context(|| format!("parse systemd control cgroup into path"))
PathBuf::try_from(&cgroup_root)
.with_context(|| format!("parse systemd control cgroup {} into path", cgroup_root))
}
}

4
crates/libcgroups/src/systemd/manager.rs
View File

@ -305,10 +305,6 @@ impl CgroupManager for Manager {
)
})?;
let cg = self.client.control_cgroup_root().context("cgroup root")?;
log::debug!("CONTROL GROUP ROOT: {:?}", cg);
log::debug!("MANAGER {:?}", self);
Ok(())
}