Handle relative cgroup paths

youki-dev · Jun 7, 2021 · 90353d9 · 90353d9
1 parent f9479f8
commit 90353d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/integration_test.sh b/integration_test.sh
@@ -3,7 +3,12 @@
 root=$(pwd)
 cd integration_test/src/github.com/opencontainers/runtime-tools
 GOPATH=$root/integration_test make runtimetest validation-executables
-test_cases=("default/default.t" "linux_cgroups_devices/linux_cgroups_devices.t" "linux_cgroups_hugetlb/linux_cgroups_hugetlb.t" "linux_cgroups_pids/linux_cgroups_pids.t" "linux_cgroups_memory/linux_cgroups_memory.t" "linux_cgroups_network/linux_cgroups_network.t" "linux_cgroups_cpus/linux_cgroups_cpus.t")
+test_cases=("default/default.t" "linux_cgroups_devices/linux_cgroups_devices.t" "linux_cgroups_hugetlb/linux_cgroups_hugetlb.t" 
+"linux_cgroups_pids/linux_cgroups_pids.t" "linux_cgroups_memory/linux_cgroups_memory.t" "linux_cgroups_network/linux_cgroups_network.t" 
+"linux_cgroups_cpus/linux_cgroups_cpus.t" "linux_cgroups_relative_blkio/linux_cgroups_relative_blkio.t" 
+"linux_cgroups_relative_cpus/linux_cgroups_relative_cpus.t" "linux_cgroups_relative_devices/linux_cgroups_relative_devices.t" 
+"linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.t" "linux_cgroups_relative_memory/linux_cgroups_relative_memory.t" 
+"linux_cgroups_relative_network/linux_cgroups_relative_network.t linux_cgroups_relative_pids/linux_cgroups_relative_pids.t")
 for case in "${test_cases[@]}"; do
   echo "Running $case"
   if [ 0 -ne $(sudo RUST_BACKTRACE=1 YOUKI_LOG_LEVEL=debug RUNTIME=$root/youki $root/integration_test/src/github.com/opencontainers/runtime-tools/validation/$case | grep "not ok" | wc -l) ]; then

diff --git a/src/cgroups/v1/manager.rs b/src/cgroups/v1/manager.rs
@@ -80,8 +80,10 @@ impl Manager {
             mount
                 .mount_point
                 .join_absolute_path(Path::new(&cgroup.pathname))?
-        } else {
+        } else if cgroup_path.is_absolute() {
             mount.mount_point.join_absolute_path(&cgroup_path)?
+        } else {
+            mount.mount_point.join(cgroup_path)
         };
 
         Ok(p)