Skip to content

Commit 17f424c

Browse files
authored
Fix incorrect cgroups memory limits (#934)
1 parent 8913cdb commit 17f424c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

core/src/worker/tuner/resource_based.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,6 @@ impl RealSysInfo {
509509
let mut lock = self.sys.lock();
510510
lock.refresh_memory();
511511
lock.refresh_cpu_usage();
512-
let mem = lock.used_memory();
513512
let cpu = lock.global_cpu_usage() as f64 / 100.;
514513
if let Some(cgroup_limits) = lock.cgroup_limits() {
515514
self.total_mem
@@ -518,8 +517,10 @@ impl RealSysInfo {
518517
cgroup_limits.total_memory - cgroup_limits.free_memory,
519518
Ordering::Release,
520519
);
520+
} else {
521+
let mem = lock.used_memory();
522+
self.cur_mem_usage.store(mem, Ordering::Release);
521523
}
522-
self.cur_mem_usage.store(mem, Ordering::Release);
523524
self.cur_cpu_usage.store(cpu.to_bits(), Ordering::Release);
524525
self.last_refresh.store(Instant::now());
525526
}

0 commit comments

Comments
 (0)