add test for Cgroup/cpu.idle

Signed-off-by: wineway <wangyuweihx@gmail.com>
youki-dev · May 10, 2022 · 8cbd30e · 8cbd30e
1 parent 0657971
commit 8cbd30e
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 90 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/libcgroups/src/v1/cpu.rs b/crates/libcgroups/src/v1/cpu.rs
@@ -215,6 +215,33 @@ mod tests {
         assert_eq!(content, RUNTIME.to_string());
     }
 
+    #[test]
+    fn test_set_cpu_idle() {
+        // arrange
+        const IDLE: i64 = 1;
+        const CPU: &str = "cpu";
+
+        if !Path::new(common::DEFAULT_CGROUP_ROOT)
+            .join(CPU)
+            .join(CGROUP_CPU_IDLE)
+            .exists()
+        {
+            // skip test_set_cpu_idle due to not found cpu.idle, maybe due to old kernel version
+            return;
+        }
+
+        let (tmp, max) = setup("test_set_cpu_idle", CGROUP_CPU_IDLE);
+        let cpu = LinuxCpuBuilder::default().idle(IDLE).build().unwrap();
+
+        // act
+        Cpu::apply(&tmp, &cpu).expect("apply cpu");
+
+        // assert
+        let content = fs::read_to_string(max)
+            .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_IDLE));
+        assert_eq!(content, IDLE.to_string());
+    }
+
     #[test]
     fn test_set_rt_period() {
         // arrange

diff --git a/crates/libcgroups/src/v2/cpu.rs b/crates/libcgroups/src/v2/cpu.rs
@@ -158,6 +158,33 @@ mod tests {
         assert_eq!(content, 840.to_string());
     }
 
+    #[test]
+    fn test_set_cpu_idle() {
+        // arrange
+        const IDLE: i64 = 1;
+        const CPU: &str = "cpu";
+
+        if !Path::new(common::DEFAULT_CGROUP_ROOT)
+            .join(CPU)
+            .join(CGROUP_CPU_IDLE)
+            .exists()
+        {
+            // skip test_set_cpu_idle due to not found cpu.idle, maybe due to old kernel version
+            return;
+        }
+
+        let (tmp, max) = setup("test_set_cpu_idle", CGROUP_CPU_IDLE);
+        let cpu = LinuxCpuBuilder::default().idle(IDLE).build().unwrap();
+
+        // act
+        Cpu::apply(&tmp, &cpu).expect("apply cpu");
+
+        // assert
+        let content = fs::read_to_string(max)
+            .unwrap_or_else(|_| panic!("read {} file content", CGROUP_CPU_IDLE));
+        assert_eq!(content, format!("{}", IDLE))
+    }
+
     #[test]
     fn test_set_positive_quota() {
         // arrange

diff --git a/tests/rust-integration-tests/integration_test/Cargo.toml b/tests/rust-integration-tests/integration_test/Cargo.toml
@@ -12,7 +12,7 @@ libcontainer = { path = "../../../crates/libcontainer" }
 log = { version = "0.4", features = ["std"] }
 nix = "0.24.1"
 num_cpus = "1.13"
-oci-spec = "0.5.5"
+oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "6df620e" }
 once_cell = "1.10.0"
 pnet = "0.29.0"
 procfs = "0.12.0"

diff --git a/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/mod.rs b/tests/rust-integration-tests/integration_test/src/tests/cgroups/cpu/mod.rs
@@ -12,6 +12,7 @@ fn create_cpu_spec(
     shares: u64,
     quota: i64,
     period: u64,
+    idle_opt: Option<i64>,
     cpus: &str,
     mems: &str,
     realtime_period_opt: Option<u64>,
@@ -24,6 +25,10 @@ fn create_cpu_spec(
         .cpus(cpus)
         .mems(mems);
 
+    if let Some(idle) = idle_opt {
+        builder = builder.idle(idle);
+    }
+
     if let Some(realtime_period) = realtime_period_opt {
         builder = builder.realtime_period(realtime_period);
     }