netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update container memory usage stats in runsc.

Browse Source 
Get the memory usage of the container from cgroups and report it in runsc
events command.

Updates #172

PiperOrigin-RevId: 591275902
This commit is contained in:
Nayana Bidari
2023-12-15 09:26:14 -08:00
committed by gVisor bot
parent cd4a40b584
commit 54e02c3c56
1 changed files with 62 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runsc/boot/events.go
+62 -25
View File
@@ -15,8 +15,10 @@
package boot
import (
"errors"
"fmt"
"strconv"
"gvisor.dev/gvisor/pkg/log"
"gvisor.dev/gvisor/pkg/sentry/control"
"gvisor.dev/gvisor/pkg/sentry/usage"
)
@@ -82,6 +84,33 @@ type CPUUsage struct {
PerCPU []uint64 `json:"percpu,omitempty"`
}
func (cm *containerManager) getUsageFromCgroups(file control.CgroupControlFile) (uint64, error) {
var out control.CgroupsResults
args := control.CgroupsReadArgs{
Args: []control.CgroupsReadArg{
{
File: file,
},
},
}
cgroups := control.Cgroups{Kernel: cm.l.k}
if err := cgroups.ReadControlFiles(&args, &out); err != nil {
return 0, err
}
if len(out.Results) != 1 {
return 0, fmt.Errorf("expected 1 result, got %d, raw: %+v", len(out.Results), out)
}
val, err := out.Results[0].Unpack()
if err != nil {
return 0, err
}
usage, err := strconv.ParseUint(val, 10, 64)
if err != nil {
return 0, err
}
return usage, nil
}
// Event gets the events from the container.
func (cm *containerManager) Event(cid *string, out *EventOut) error {
*out = EventOut{
@@ -98,34 +127,42 @@ func (cm *containerManager) Event(cid *string, out *EventOut) error {
}
out.Event.Data.Pids.Current = uint64(pids)
// Memory usage.
mem := cm.l.k.MemoryFile()
_ = mem.UpdateUsage(nil) // best effort to update.
_, totalUsage := usage.MemoryAccounting.Copy()
switch containers := cm.l.containerCount(); containers {
case 0:
return errors.New("no container was found")
case 1:
// There is a single container, so total usage can only come from it.
default:
// In the multi-container case, reports 0 for the root (pause) container,
// since it's small and idle. Then equally split the usage to the other
// containers. At least the sum of all containers will correctly account
// for the memory used by the sandbox.
//
// TODO(gvisor.dev/issue/172): Proper per-container accounting.
if *cid == cm.l.sandboxID {
totalUsage = 0
} else {
totalUsage /= uint64(containers - 1)
}
numContainers := cm.l.containerCount()
if numContainers == 0 {
return fmt.Errorf("no container was found")
}
out.Event.Data.Memory.Usage.Usage = totalUsage
// Memory usage.
memFile := control.CgroupControlFile{"memory", "/" + *cid, "memory.usage_in_bytes"}
memUsage, err := cm.getUsageFromCgroups(memFile)
if err != nil {
// Cgroups is not installed or there was an error to get usage
// from the cgroups. Fall back to the old method of getting the
// usage from the sentry.
log.Warningf("could not get container memory usage from cgroups, error: %v", err)
mem := cm.l.k.MemoryFile()
_ = mem.UpdateUsage(nil) // best effort to update.
_, totalUsage := usage.MemoryAccounting.Copy()
if numContainers == 1 {
memUsage = totalUsage
} else {
// In the multi-container case, reports 0 for the root (pause)
// container, since it's small and idle. Then equally split the
// usage to the other containers. At least the sum of all
// containers will correctly account for the memory used by the
// sandbox.
if *cid == cm.l.sandboxID {
memUsage = 0
} else {
memUsage = totalUsage / uint64(numContainers-1)
}
}
}
out.Event.Data.Memory.Usage.Usage = memUsage
// CPU usage by container.
// TODO(gvisor.dev/issue/172) : Get cpu usage from cgroups.
out.ContainerUsage = control.ContainerUsage(cm.l.k)
return nil