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

Consolidate stats tracker consts, and add Usage to tracker test

Browse Source
This commit is contained in:
Phil Renaud
2022-08-03 12:05:45 -04:00
parent 85d9795134
commit 642d5cc2aa
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
ui/tests/unit/utils/allocation-stats-tracker-test.js
View File

@@ -54,6 +54,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 400) * 1024 * 1024,
Usage: (step + 400) * 1024 * 1024,
},
},
Tasks: {
@@ -64,6 +65,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 100) * 1024 * 1024,
Usage: (step + 100) * 1024 * 1024,
},
},
Timestamp: refDate + step,
@@ -75,6 +77,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 50) * 1024 * 1024,
Usage: (step + 50) * 1024 * 1024,
},
},
Timestamp: refDate + step * 10,
@@ -86,6 +89,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 51) * 1024 * 1024,
Usage: (step + 51) * 1024 * 1024,
},
},
Timestamp: refDate + step * 100,