mirror of
https://github.com/kemko/nomad.git
synced 2026-01-08 03:15:42 +03:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user