mirror of
https://github.com/kemko/nomad.git
synced 2026-01-06 10:25:42 +03:00
Don't rely on CpuStats.Percent
Just do the math client-side with TotalTicks and Reserved
This commit is contained in:
@@ -57,8 +57,13 @@ export default Model.extend({
|
||||
return used / total;
|
||||
}),
|
||||
|
||||
percentCPU: computed('stats.ResourceUsage.CpuStats.Percent', function() {
|
||||
return this.get('stats.ResourceUsage.CpuStats.Percent') || 0;
|
||||
percentCPU: computed('cpuUsed', 'taskGroup.reservedCPU', function() {
|
||||
const used = this.get('cpuUsed');
|
||||
const total = this.get('taskGroup.reservedCPU');
|
||||
if (!total || !used) {
|
||||
return 0;
|
||||
}
|
||||
return used / total;
|
||||
}),
|
||||
|
||||
stats: computed('node.{isPartial,httpAddr}', function() {
|
||||
|
||||
@@ -172,7 +172,7 @@ test('each allocation should have high-level details for the allocation', functi
|
||||
.find('td:eq(6)')
|
||||
.text()
|
||||
.trim(),
|
||||
allocStats.resourceUsage.CpuStats.Percent,
|
||||
Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
|
||||
'CPU %'
|
||||
);
|
||||
assert.equal(
|
||||
|
||||
@@ -217,7 +217,7 @@ test('each allocation should show stats about the allocation, retrieved directly
|
||||
.find('td:eq(6)')
|
||||
.text()
|
||||
.trim(),
|
||||
allocStats.resourceUsage.CpuStats.Percent,
|
||||
Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
|
||||
'CPU %'
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user