Skip to content

Commit

Permalink
ui: fix alloc memory stats to match CLI output
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Jan 26, 2023
1 parent de54f8d commit d63e371
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 16 deletions.
23 changes: 11 additions & 12 deletions ui/app/utils/classes/allocation-stats-tracker.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ const sortMap = [
const taskPrioritySort = (a, b) =>
sortMap[a.lifecycleName] - sortMap[b.lifecycleName];

// Select the value for memory usage.
// Must match logic in command/alloc_status.go.
const memoryUsed = (frame) =>
frame.ResourceUsage.MemoryStats.RSS ||
frame.ResourceUsage.MemoryStats.Usage ||
0;

@classic
class AllocationStatsTracker extends EmberObject.extend(AbstractStatsTracker) {
// Set via the stats computed property macro
Expand All @@ -49,15 +56,11 @@ class AllocationStatsTracker extends EmberObject.extend(AbstractStatsTracker) {
percent: percent(cpuUsed, this.reservedCPU),
});

const memoryUsed =
frame.ResourceUsage.MemoryStats.Usage ||
frame.ResourceUsage.MemoryStats.RSS ||
0;

const memUsed = memoryUsed(frame);
this.memory.pushObject({
timestamp,
used: memoryUsed,
percent: percent(memoryUsed / 1024 / 1024, this.reservedMemory),
used: memUsed,
percent: percent(memUsed / 1024 / 1024, this.reservedMemory),
});

let aggregateCpu = 0;
Expand All @@ -84,11 +87,7 @@ class AllocationStatsTracker extends EmberObject.extend(AbstractStatsTracker) {
percentStack: percentCpuTotal + aggregateCpu,
});

const taskMemoryUsed =
taskFrame.ResourceUsage.MemoryStats.Usage ||
taskFrame.ResourceUsage.MemoryStats.RSS ||
0;

const taskMemoryUsed = memoryUsed(taskFrame);
const percentMemoryTotal = percent(
taskMemoryUsed / 1024 / 1024,
this.reservedMemory
Expand Down
8 changes: 4 additions & 4 deletions ui/tests/unit/utils/allocation-stats-tracker-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 400) * 1024 * 1024,
Usage: (step + 400) * 1024 * 1024,
Usage: (step + 800) * 1024 * 1024,
},
},
Tasks: {
Expand All @@ -65,7 +65,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 100) * 1024 * 1024,
Usage: (step + 100) * 1024 * 1024,
Usage: (step + 200) * 1024 * 1024,
},
},
Timestamp: refDate + step,
Expand All @@ -77,7 +77,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 50) * 1024 * 1024,
Usage: (step + 50) * 1024 * 1024,
Usage: (step + 100) * 1024 * 1024,
},
},
Timestamp: refDate + step * 10,
Expand All @@ -89,7 +89,7 @@ module('Unit | Util | AllocationStatsTracker', function () {
},
MemoryStats: {
RSS: (step + 51) * 1024 * 1024,
Usage: (step + 51) * 1024 * 1024,
Usage: (step + 101) * 1024 * 1024,
},
},
Timestamp: refDate + step * 100,
Expand Down

0 comments on commit d63e371

Please sign in to comment.