cgroups2: export memory max usage and swap max usage

Signed-off-by: Heran Yang <heran55@126.com>
containerd · Oct 13, 2023 · a1235a5 · a1235a5
1 parent a0ae1c2
commit a1235a5
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 45 deletions.
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -594,8 +594,10 @@ func (c *Manager) Stat() (*stats.Metrics, error) {
 		ThpCollapseAlloc:      out["thp_collapse_alloc"],
 		Usage:                 getStatFileContentUint64(filepath.Join(c.path, "memory.current")),
 		UsageLimit:            getStatFileContentUint64(filepath.Join(c.path, "memory.max")),
+		MaxUsage:              getStatFileContentUint64(filepath.Join(c.path, "memory.peak")),
 		SwapUsage:             getStatFileContentUint64(filepath.Join(c.path, "memory.swap.current")),
 		SwapLimit:             getStatFileContentUint64(filepath.Join(c.path, "memory.swap.max")),
+		SwapMaxUsage:          getStatFileContentUint64(filepath.Join(c.path, "memory.swap.peak")),
 	}
 	if len(memoryEvents) > 0 {
 		metrics.MemoryEvents = &stats.MemoryEvents{

diff --git a/cgroup2/stats/metrics.pb.go b/cgroup2/stats/metrics.pb.go
diff --git a/cgroup2/stats/metrics.pb.txt b/cgroup2/stats/metrics.pb.txt
@@ -369,6 +369,20 @@ file {
       type: TYPE_UINT64
       json_name: "swapLimit"
     }
+    field {
+      name: "max_usage"
+      number: 36
+      label: LABEL_OPTIONAL
+      type: TYPE_UINT64
+      json_name: "maxUsage"
+    }
+    field {
+      name: "swap_max_usage"
+      number: 37
+      label: LABEL_OPTIONAL
+      type: TYPE_UINT64
+      json_name: "swapMaxUsage"
+    }
   }
   message_type {
     name: "MemoryEvents"

diff --git a/cgroup2/stats/metrics.proto b/cgroup2/stats/metrics.proto
@@ -64,6 +64,8 @@ message MemoryStat {
 	uint64 usage_limit = 33;
 	uint64 swap_usage = 34;
 	uint64 swap_limit = 35;
+	uint64 max_usage = 36;
+	uint64 swap_max_usage = 37;
 }
 
 message MemoryEvents {