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

ui: fix bug where allocation memory usage is always zero

Browse Source 
This PR fixes a bug where allocation memory usage is always zero on
Linux systems where the kernel is configured to use cgroups v2.
This commit is contained in:
Seth Hoenig
2022-08-02 16:54:50 -05:00
parent 2e0b875b14
commit 17000bad0b
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/app/utils/classes/allocation-stats-tracker.js
View File

@@ -49,7 +49,13 @@ class AllocationStatsTracker extends EmberObject.extend(AbstractStatsTracker) {
percent: percent(cpuUsed, this.reservedCPU),
});
const memoryUsed = frame.ResourceUsage.MemoryStats.RSS;
let memoryUsed = 0;
if (frame.ResourceUsage.MemoryStats.Usage) {
memoryUsed = frame.ResourceUsage.MemoryStats.Usage;
} else {
memoryUsed = frame.ResourceUsage.MemoryStats.RSS;
}
this.memory.pushObject({
timestamp,
used: memoryUsed,
@@ -80,7 +86,13 @@ class AllocationStatsTracker extends EmberObject.extend(AbstractStatsTracker) {
percentStack: percentCpuTotal + aggregateCpu,
});
const taskMemoryUsed = taskFrame.ResourceUsage.MemoryStats.RSS;
let taskMemoryUsed = 0;
if (frame.ResourceUsage.MemoryStats.Usage) {
taskMemoryUsed = frame.ResourceUsage.MemoryStats.Usage;
} else {
taskMemoryUsed = frame.ResourceUsage.MemoryStats.RSS;
}
const percentMemoryTotal = percent(
taskMemoryUsed / 1024 / 1024,
this.reservedMemory