From 37f34781d11eb8f049da7d2abb420527311fbd7a Mon Sep 17 00:00:00 2001 From: Jiang Liu Date: Sat, 5 Aug 2023 23:37:15 +0800 Subject: [PATCH] agent: simplify function online_cpu_memory() Simplify function online_cpu_memory() by on calling update_cpuset_path() for containers with cpuset configured. Signed-off-by: Jiang Liu --- src/agent/src/sandbox.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/agent/src/sandbox.rs b/src/agent/src/sandbox.rs index 11a136c831..473c7cee7f 100644 --- a/src/agent/src/sandbox.rs +++ b/src/agent/src/sandbox.rs @@ -270,20 +270,17 @@ impl Sandbox { let guest_cpuset = rustjail_cgroups::fs::get_guest_cpuset()?; for (_, ctr) in self.containers.iter() { - let mut container_cpust = ""; if let Some(spec) = ctr.config.spec.as_ref() { if let Some(linux) = spec.linux.as_ref() { if let Some(resources) = linux.resources.as_ref() { if let Some(cpus) = resources.cpu.as_ref() { - container_cpust = &cpus.cpus; + info!(self.logger, "updating {}", ctr.id.as_str()); + ctr.cgroup_manager + .update_cpuset_path(guest_cpuset.as_str(), &cpus.cpus)?; } } } } - - info!(self.logger, "updating {}", ctr.id.as_str()); - ctr.cgroup_manager - .update_cpuset_path(guest_cpuset.as_str(), container_cpust)?; } Ok(())