Backport of cli: for systems with cgroups v2, fix alloation resource …

…utilization showing 0 memory used into release/1.3.x (#14266) This pull request was automerged via backport-assistant
hashicorp · Aug 23, 2022 · 32ad0d9 · 32ad0d9
1 parent 21d5267
commit 32ad0d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.changelog/14069.txt b/.changelog/14069.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed a bug where the memory usage reported by Allocation Resource Utilization is zero on systems using cgroups v2
+```
diff --git a/command/node_status.go b/command/node_status.go
@@ -964,7 +964,11 @@ func getActualResources(client *api.Client, runningAllocs []*api.Allocation, nod
 		}
 
 		cpu += stats.ResourceUsage.CpuStats.TotalTicks
-		mem += stats.ResourceUsage.MemoryStats.RSS
+		if stats.ResourceUsage.MemoryStats.Usage > 0 {
+			mem += stats.ResourceUsage.MemoryStats.Usage
+		} else {
+			mem += stats.ResourceUsage.MemoryStats.RSS
+		}
 	}
 
 	resources := make([]string, 2)