mirror of
https://github.com/henrygd/beszel.git
synced 2026-10-03 23:07:46 +02:00
fix(agent): report LXC guest CPU usage from cgroup accounting (#2341)
Inside an LXC guest, lxcfs serves /proc/stat with the counters of the host cores in the guest's cpuset, so an idle guest sharing a core with a busy neighbor reported near-100% CPU. When the agent detects it is running in an LXC guest (lxcfs mounted on /proc/stat, container=lxc, or /run/systemd/container), derive CPU usage from the guest's own cgroup instead: cpu.stat on cgroup v2, cpuacct on v1, read at the cgroup mount root so it covers every process in the guest. Usage is normalized by the usable cores (the smallest of the affinity mask, cpuset and CPU quota). Per-core usage is omitted in this mode, since the per-core /proc/stat counters describe shared host cores and would contradict the total. Iowait and steal are not available from cgroup accounting and report as zero. Hosts and Docker/Podman agents are unaffected and keep reading /proc/stat, as does an LXC guest whose cgroup accounting is unreadable. --------- Co-authored-by: hank <hank@henrygd.me>
This commit is contained in:
9
agent/cpu_unsupported.go
Normal file
9
agent/cpu_unsupported.go
Normal file
@@ -0,0 +1,9 @@
|
||||
//go:build !linux
|
||||
|
||||
package agent
|
||||
|
||||
// containerCpuMetrics is Linux-only (cgroup accounting). Other platforms keep
|
||||
// the gopsutil /proc path.
|
||||
func containerCpuMetrics(uint16) (CpuMetrics, bool) {
|
||||
return CpuMetrics{}, false
|
||||
}
|
||||
Reference in New Issue
Block a user