luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #3425 from hashicorp/b-ui-correct-cpu-usage

Browse source 
Don't rely on CpuStats.Percent
This commit is contained in:
Michael Lange 2017-10-19 12:20:34 -07:00 committed by GitHub
parent 18ad13cebf b693ff1886
commit ce786488e0
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui/app/models/allocation.js
View file

@ -57,8 +57,13 @@ export default Model.extend({
return used / total; return used / total;
}), }),
percentCPU: computed('stats.ResourceUsage.CpuStats.Percent', function() { percentCPU: computed('cpuUsed', 'taskGroup.reservedCPU', function() {
return this.get('stats.ResourceUsage.CpuStats.Percent') || 0; 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() { stats: computed('node.{isPartial,httpAddr}', function() {

2
ui/tests/acceptance/client-detail-test.js
View file

@ -172,7 +172,7 @@ test('each allocation should have high-level details for the allocation', functi
.find('td:eq(6)') .find('td:eq(6)')
.text() .text()
.trim(), .trim(),
allocStats.resourceUsage.CpuStats.Percent, Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
'CPU %' 'CPU %'
); );
assert.equal( assert.equal(

2
ui/tests/acceptance/task-group-detail-test.js
View file

@ -217,7 +217,7 @@ test('each allocation should show stats about the allocation, retrieved directly
.find('td:eq(6)') .find('td:eq(6)')
.text() .text()
.trim(), .trim(),
allocStats.resourceUsage.CpuStats.Percent, Math.floor(allocStats.resourceUsage.CpuStats.TotalTicks) / cpuUsed,
'CPU %' 'CPU %'
); );