ui: Add optional memory max to task details ribbon

ui/app/models/resources.js

@@ -5,6 +5,7 @@ import { fragmentArray } from 'ember-data-model-fragments/attributes';
 export default class Resources extends Fragment {
   @attr('number') cpu;
   @attr('number') memory;
+  @attr('number') memoryMax;
   @attr('number') disk;
   @attr('number') iops;
   @fragmentArray('network', { defaultValue: () => [] }) networks;

ui/app/models/task-group.js

@@ -34,6 +34,7 @@ export default class TaskGroup extends Fragment {
 
   @sumAggregation('tasks', 'reservedCPU') reservedCPU;
   @sumAggregation('tasks', 'reservedMemory') reservedMemory;
+  @sumAggregation('tasks', 'reservedMemoryMax') reservedMemoryMax;
   @sumAggregation('tasks', 'reservedDisk') reservedDisk;
 
   @attr('number') reservedEphemeralDisk;

ui/app/models/task.js

@@ -30,6 +30,7 @@ export default class Task extends Fragment {
   }
 
   @attr('number') reservedMemory;
+  @attr('number') reservedMemoryMax;
   @attr('number') reservedCPU;
   @attr('number') reservedDisk;
   @attr('number') reservedEphemeralDisk;

ui/app/serializers/task.js

@@ -6,6 +6,7 @@ export default class Task extends ApplicationSerializer {
     const resources = hash.Resources;
     if (resources) {
       hash.ReservedMemory = resources.MemoryMB;
+      hash.ReservedMemoryMax = resources.MemoryMaxMB;
       hash.ReservedCPU = resources.CPU;
       hash.ReservedDisk = resources.DiskMB;
       hash.ReservedEphemeralDisk = hash.EphemeralDisk.SizeMB;

ui/app/templates/jobs/job/task-group.hbs

@@ -31,7 +31,13 @@
 
       <span class="pair" data-test-task-group-tasks><span class="term"># Tasks</span> {{this.model.tasks.length}}</span>
       <span class="pair" data-test-task-group-cpu><span class="term">Reserved CPU</span> {{format-scheduled-hertz this.model.reservedCPU}}</span>
-      <span class="pair" data-test-task-group-mem><span class="term">Reserved Memory</span> {{format-scheduled-bytes this.model.reservedMemory start="MiB"}}</span>
+      <span class="pair" data-test-task-group-mem>
+        <span class="term">Reserved Memory</span>
+        {{format-scheduled-bytes this.model.reservedMemory start="MiB"}}
+        {{#if this.model.reservedMemoryMax}}
+          ({{format-scheduled-bytes this.model.reservedMemoryMax start="MiB"}})
+        {{/if}}
+      </span>
       <span class="pair" data-test-task-group-disk><span class="term">Reserved Disk</span> {{format-scheduled-bytes this.model.reservedEphemeralDisk start="MiB"}}</span>
       {{#if this.model.scaling}}
         <span class="pair" data-test-task-group-min><span class="term">Count Range</span>

ui/mirage/common.js

@@ -24,7 +24,7 @@ export const HOSTS = provide(100, () => {
 export const STORAGE_PROVIDERS = ['ebs', 'zfs', 'nfs', 'cow', 'moo'];
 
 export function generateResources(options = {}) {
-  return {
+  const resources = {
     Cpu: {
       CpuShares: options.CPU || faker.helpers.randomize(CPU_RESERVATIONS),
     },
@@ -37,6 +37,15 @@ export function generateResources(options = {}) {
     Networks: generateNetworks(options.networks),
     Ports: generatePorts(options.networks),
   };
+
+  if (faker.random.boolean()) {
+    const higherMemoryReservations = MEMORY_RESERVATIONS.filter(mb => mb > resources.Memory.MemoryMB);
+    resources.Memory.MemoryMaxMB = faker.helpers.randomize(higherMemoryReservations) || resources.Memory.MemoryMB + 1;
+  } else {
+    resources.Memory.MemoryMaxMB = 0;
+  }
+
+  return resources;
 }
 
 export function generateNetworks(options = {}) {

ui/mirage/factories/task.js

@@ -26,6 +26,7 @@ export default Factory.extend({
     return {
       CPU: resources.Cpu.CpuShares,
       MemoryMB: resources.Memory.MemoryMB,
+      MemoryMaxMB: resources.Memory.MemoryMaxMB,
       DiskMB: resources.Disk.DiskMB,
     };
   },

ui/tests/acceptance/task-group-detail-test.js

@@ -82,6 +82,7 @@ module('Acceptance | task group detail', function(hooks) {
   test('/jobs/:id/:task-group should list high-level metrics for the allocation', async function(assert) {
     const totalCPU = tasks.mapBy('resources.CPU').reduce(sum, 0);
     const totalMemory = tasks.mapBy('resources.MemoryMB').reduce(sum, 0);
+    const totalMemoryMax = tasks.mapBy('resources.MemoryMaxMB').reduce(sum, 0);
     const totalDisk = taskGroup.ephemeralDisk.SizeMB;
 
     await TaskGroup.visit({ id: job.id, name: taskGroup.name });
@@ -92,9 +93,16 @@ module('Acceptance | task group detail', function(hooks) {
       `Reserved CPU ${formatScheduledHertz(totalCPU, 'MHz')}`,
       'Aggregated CPU reservation for all tasks'
     );
+
+    let totalMemoryMaxAddendum = '';
+
+    if (totalMemoryMax) {
+      totalMemoryMaxAddendum = ` (${formatScheduledBytes(totalMemoryMax, 'MiB')})`;
+    }
+
     assert.equal(
       TaskGroup.mem,
-      `Reserved Memory ${formatScheduledBytes(totalMemory, 'MiB')}`,
+      `Reserved Memory ${formatScheduledBytes(totalMemory, 'MiB')}${totalMemoryMaxAddendum}`,
       'Aggregated Memory reservation for all tasks'
     );
     assert.equal(