From 7c0d1797af7c7b4ecf83d9dbe838bc2967639e6b Mon Sep 17 00:00:00 2001 From: Zhang Tianyang Date: Fri, 5 Apr 2024 16:29:57 +0800 Subject: [PATCH] cgroup: use default sandbox cgroup path Signed-off-by: Zhang Tianyang --- vmm/sandbox/src/cgroup.rs | 1 + vmm/sandbox/src/sandbox.rs | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/vmm/sandbox/src/cgroup.rs b/vmm/sandbox/src/cgroup.rs index a4576580..932dcdf1 100644 --- a/vmm/sandbox/src/cgroup.rs +++ b/vmm/sandbox/src/cgroup.rs @@ -29,6 +29,7 @@ use crate::{ vm::VcpuThreads, }; +pub const DEFAULT_CGROUP_PARENT_PATH: &str = "kuasar-vmm"; pub const VCPU_CGROUP_NAME: &str = "vcpu"; pub const POD_OVERHEAD_CGROUP_NAME: &str = "pod_overhead"; diff --git a/vmm/sandbox/src/sandbox.rs b/vmm/sandbox/src/sandbox.rs index 0105b098..5c19764e 100644 --- a/vmm/sandbox/src/sandbox.rs +++ b/vmm/sandbox/src/sandbox.rs @@ -39,7 +39,7 @@ use vmm_common::{ }; use crate::{ - cgroup::SandboxCgroup, + cgroup::{SandboxCgroup, DEFAULT_CGROUP_PARENT_PATH}, client::{ client_check, client_sync_clock, client_update_interfaces, client_update_routes, new_sandbox_client, @@ -154,14 +154,8 @@ where } let mut sandbox_cgroups = SandboxCgroup::default(); - let cgroup_parent_path = match get_sandbox_cgroup_parent_path(&s.sandbox) { - Some(cgroup_parent_path) => cgroup_parent_path, - None => { - return Err(Error::Other(anyhow!( - "Failed to get sandbox cgroup parent path." - ))) - } - }; + let cgroup_parent_path = get_sandbox_cgroup_parent_path(&s.sandbox) + .unwrap_or(DEFAULT_CGROUP_PARENT_PATH.to_string()); // Currently only support cgroup V1, cgroup V2 is not supported now if !cgroups_rs::hierarchies::is_cgroup2_unified_mode() { // Create sandbox's cgroup and apply sandbox's resources limit