kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14069 from brian-athinkingape/cli-fix-memstats-cgroupsv2

Browse Source 
cli: for systems with cgroups v2, fix alloation resource utilization showing 0 memory used
This commit is contained in:
Seth Hoenig
2022-08-11 07:27:48 -05:00
committed by GitHub
parent e144298b02 c0626dab35
commit 169211251d
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/14069.txt Normal file
View File

@@ -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
```

6
command/node_status.go
View File

@@ -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)