exclude cgroups slab_reclaimable from container_memory_working_set_bytes

CharlieR-o-o-t · CharlieR-o-o-t · commit 1fb2bbd504f9 · 2025-02-02T22:46:58.000+02:00
Signed-off-by: Siarhei Rasiukevich &lt;s.rasiukevich@gmail.com&gt;
diff --git a/container/libcontainer/handler.go b/container/libcontainer/handler.go
@@ -848,6 +848,12 @@ func setMemoryStats(s *cgroups.Stats, ret *info.ContainerStats) {
 			workingSet -= v
 		}
 	}
+
+	// Exclude "slab_reclaimable" from workingSet
+	if v, ok := s.MemoryStats.Stats["slab_reclaimable"]; ok {
+		workingSet -= v
+	}
+
 	ret.Memory.WorkingSet = workingSet
 }
 

Original file line number	Diff line number	Diff line change
`@@ -848,6 +848,12 @@ func setMemoryStats(s cgroups.Stats, ret info.ContainerStats) {`
`848`	`848`	`workingSet -= v`
`849`	`849`	`}`
`850`	`850`	`}`
	`851`	`+`
	`852`	`+ // Exclude "slab_reclaimable" from workingSet`
	`853`	`+ if v, ok := s.MemoryStats.Stats["slab_reclaimable"]; ok {`
	`854`	`+ workingSet -= v`
	`855`	`+ }`
	`856`	`+`
`851`	`857`	`ret.Memory.WorkingSet = workingSet`
`852`	`858`	`}`
`853`	`859`