Skip to content

fix(sysinfo): use RSS instead of usage_in_bytes for cgroup memory stats #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaius-qi merged 7 commits into from
Mar 20, 2026
Merged

fix(sysinfo): use RSS instead of usage_in_bytes for cgroup memory stats #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4e6e474
feat: bump version to 1.2.18 and fix CPU process stats collection
gaius-qi Mar 19, 2026
5699604
feat(sysinfo): fix debug log field order in memory usage message
gaius-qi Mar 19, 2026
3394e5e
feat(announcer): add cgroup cpu/memory stats for container environments
gaius-qi Mar 19, 2026
2ca4990
docs(sysinfo): add 'cgroup' prefix to cpu and memory debug log messages
gaius-qi Mar 19, 2026
6a230d1
fix(ratelimiter): remove redundant *100.0 in BBR memory check
gaius-qi Mar 20, 2026
680af36
fix(sysinfo): use RSS instead of usage_in_bytes for cgroup memory stats
gaius-qi Mar 20, 2026
4073bac
Merge branch 'main' of github.com:dragonflyoss/client into feature/bbr
gaius-qi Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dragonfly-client-util/src/ratelimiter/bbr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,14 @@ impl OverloadCollector {
fn is_memory_overloaded(&self) -> bool {
let used_percent = if self.is_running_in_container {
match self.memory.get_cgroup_stats(self.pid) {
Some(stats) => (stats.used_percent * 100.0).round() as u8,
Some(stats) => stats.used_percent.round() as u8,
None => {
warn!("container detected but cgroup memory stats unavailable, falling back to process stats");
(self.memory.get_process_stats(self.pid).used_percent * 100.0).round() as u8
self.memory.get_process_stats(self.pid).used_percent.round() as u8
}
}
} else {
(self.memory.get_process_stats(self.pid).used_percent * 100.0).round() as u8
self.memory.get_process_stats(self.pid).used_percent.round() as u8
};

self.memory_used_percent
Expand Down
10 changes: 4 additions & 6 deletions dragonfly-client-util/src/sysinfo/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,25 +146,23 @@ impl Memory {
if let Some(memory_controller) = cgroup.controller_of::<MemController>() {
let memory_stats = memory_controller.memory_stat();
let used_percent = if memory_stats.limit_in_bytes > 0 {
(memory_stats.usage_in_bytes as f64
/ memory_stats.limit_in_bytes as f64)
(memory_stats.stat.rss as f64 / memory_stats.limit_in_bytes as f64)
* 100.0
} else {
(memory_stats.usage_in_bytes as f64 / self.get_stats().total as f64)
* 100.0
(memory_stats.stat.rss as f64 / self.get_stats().total as f64) * 100.0
};

debug!(
"process {} cgroup memory limit: {} bytes, memory usage: {} bytes, used percent: {}%",
pid,
memory_stats.limit_in_bytes,
memory_stats.usage_in_bytes,
memory_stats.stat.rss,
used_percent,
);

return Some(CgroupMemoryStats {
limit: memory_stats.limit_in_bytes,
usage: memory_stats.usage_in_bytes,
usage: memory_stats.stat.rss,
used_percent: used_percent.clamp(0.0, 100.0),
});
}
Expand Down
Loading