ui: fix alloc memory stats to match CLI output (#15909)
This commit is contained in:
parent
ce3eef8037
commit
09fc054c82
|
@ -0,0 +1,3 @@
|
|||
```release-note:bug
|
||||
ui: Fix allocation memory chart to display the same value as the CLI
|
||||
```
|
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
|
|
@ -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: {
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue