Fix the memory usage math

1. Use RSS, not Cache (shoulda read the source)
2. Convert bytes to megabytes before doing division
This commit is contained in:
Michael Lange
2017-10-16 18:46:35 -07:00
parent 5f617d7955
commit 93202b2e1b

View File

@@ -30,18 +30,19 @@ export default Model.extend({
return taskGroups && taskGroups.findBy('name', this.get('taskGroupName'));
}),
percentMemory: computed(
'taskGroup.reservedMemory',
'stats.ResourceUsage.MemoryStats.Cache',
function() {
const used = this.get('stats.ResourceUsage.MemoryStats.Cache');
const total = this.get('taskGroup.reservedMemory');
if (!total || !used) {
return 0;
}
return used / total;
memoryUsed: computed.readOnly('stats.ResourceUsage.MemoryStats.RSS'),
cpuUsed: computed('stats.ResourceUsage.CpuStats.TotalTicks', function() {
return Math.floor(this.get('stats.ResourceUsage.CpuStats.TotalTicks'));
}),
percentMemory: computed('taskGroup.reservedMemory', 'memoryUsed', function() {
const used = this.get('memoryUsed') / 1024 / 1024;
const total = this.get('taskGroup.reservedMemory');
if (!total || !used) {
return 0;
}
),
return used / total;
}),
percentCPU: computed('stats.ResourceUsage.CpuStats.Percent', function() {
return this.get('stats.ResourceUsage.CpuStats.Percent') || 0;