-
-
- {{primary-metric resource=model metric="cpu"}}
+ {{#if model.isRunning}}
+
+
+ {{primary-metric resource=model metric="cpu"}}
+
+
+ {{primary-metric resource=model metric="memory"}}
+
-
- {{primary-metric resource=model metric="memory"}}
+ {{else}}
+
+
Task isn't running
+
Only running tasks utilize resources.
-
+ {{/if}}
diff --git a/ui/app/templates/components/allocation-row.hbs b/ui/app/templates/components/allocation-row.hbs
index 229efef85..ffdfb9a5e 100644
--- a/ui/app/templates/components/allocation-row.hbs
+++ b/ui/app/templates/components/allocation-row.hbs
@@ -42,42 +42,42 @@
{{allocation.jobVersion}} |
{{/if}}
- {{#if (and (not cpu) fetchStats.isRunning)}}
- ...
- {{else if (not allocation)}}
- {{! nothing when there's no allocation}}
- {{else if statsError}}
-
- {{x-icon "warning" class="is-warning"}}
-
- {{else}}
-
+ {{#if allocation.isRunning}}
+ {{#if (and (not cpu) fetchStats.isRunning)}}
+ ...
+ {{else if statsError}}
+
+ {{x-icon "warning" class="is-warning"}}
+
+ {{else}}
+
+ {{/if}}
{{/if}}
|
- {{#if (and (not memory) fetchStats.isRunning)}}
- ...
- {{else if (not allocation)}}
- {{! nothing when there's no allocation}}
- {{else if statsError}}
-
- {{x-icon "warning" class="is-warning"}}
-
- {{else}}
-
+ {{#if allocation.isRunning}}
+ {{#if (and (not memory) fetchStats.isRunning)}}
+ ...
+ {{else if statsError}}
+
+ {{x-icon "warning" class="is-warning"}}
+
+ {{else}}
+
+ {{/if}}
{{/if}}
|
diff --git a/ui/app/templates/components/task-row.hbs b/ui/app/templates/components/task-row.hbs
index 54464ed91..55961a778 100644
--- a/ui/app/templates/components/task-row.hbs
+++ b/ui/app/templates/components/task-row.hbs
@@ -38,42 +38,42 @@
- {{#if (and (not cpu) fetchStats.isRunning)}}
- ...
- {{else if (not task)}}
- {{! nothing when there's no task}}
- {{else if statsError}}
-
- {{x-icon "warning" class="is-warning"}}
-
- {{else}}
-
+ {{#if task.isRunning}}
+ {{#if (and (not cpu) fetchStats.isRunning)}}
+ ...
+ {{else if statsError}}
+
+ {{x-icon "warning" class="is-warning"}}
+
+ {{else}}
+
+ {{/if}}
{{/if}}
|
- {{#if (and (not memory) fetchStats.isRunning)}}
- ...
- {{else if (not task)}}
- {{! nothing when there's no task}}
- {{else if statsError}}
-
- {{x-icon "warning" class="is-warning"}}
-
- {{else}}
-
+ {{#if task.isRunning}}
+ {{#if (and (not memory) fetchStats.isRunning)}}
+ ...
+ {{else if statsError}}
+
+ {{x-icon "warning" class="is-warning"}}
+
+ {{else}}
+
+ {{/if}}
{{/if}}
|
diff --git a/ui/tests/acceptance/allocation-detail-test.js b/ui/tests/acceptance/allocation-detail-test.js
index bb7854ac9..dba89d9b5 100644
--- a/ui/tests/acceptance/allocation-detail-test.js
+++ b/ui/tests/acceptance/allocation-detail-test.js
@@ -191,3 +191,24 @@ moduleForAcceptance('Acceptance | allocation detail (rescheduled)', {
test('when the allocation has been rescheduled, the reschedule events section is rendered', function(assert) {
assert.ok(Allocation.hasRescheduleEvents, 'Reschedule Events section exists');
});
+
+moduleForAcceptance('Acceptance | allocation detail (not running)', {
+ beforeEach() {
+ server.create('agent');
+
+ node = server.create('node');
+ job = server.create('job', { createAllocations: false });
+ allocation = server.create('allocation', { clientStatus: 'pending' });
+
+ Allocation.visit({ id: allocation.id });
+ },
+});
+
+test('when the allocation is not running, the utilization graphs are replaced by an empty message', function(assert) {
+ assert.equal(Allocation.resourceCharts.length, 0, 'No resource charts');
+ assert.equal(
+ Allocation.resourceEmptyMessage,
+ "Allocation isn't running",
+ 'Empty message is appropriate'
+ );
+});
diff --git a/ui/tests/acceptance/client-detail-test.js b/ui/tests/acceptance/client-detail-test.js
index b13ce5ade..28e960ad2 100644
--- a/ui/tests/acceptance/client-detail-test.js
+++ b/ui/tests/acceptance/client-detail-test.js
@@ -19,7 +19,7 @@ moduleForAcceptance('Acceptance | client detail', {
// Related models
server.create('agent');
server.create('job', { createAllocations: false });
- server.createList('allocation', 3, { nodeId: node.id });
+ server.createList('allocation', 3, { nodeId: node.id, clientStatus: 'running' });
},
});
@@ -545,10 +545,14 @@ moduleForAcceptance('Acceptance | client detail (multi-namespace)', {
// Make a job for each namespace, but have both scheduled on the same node
server.create('job', { id: 'job-1', namespaceId: 'default', createAllocations: false });
- server.createList('allocation', 3, { nodeId: node.id });
+ server.createList('allocation', 3, { nodeId: node.id, clientStatus: 'running' });
server.create('job', { id: 'job-2', namespaceId: 'other-namespace', createAllocations: false });
- server.createList('allocation', 3, { nodeId: node.id, jobId: 'job-2' });
+ server.createList('allocation', 3, {
+ nodeId: node.id,
+ jobId: 'job-2',
+ clientStatus: 'running',
+ });
},
});
diff --git a/ui/tests/acceptance/task-detail-test.js b/ui/tests/acceptance/task-detail-test.js
index 177df255d..aab5c954c 100644
--- a/ui/tests/acceptance/task-detail-test.js
+++ b/ui/tests/acceptance/task-detail-test.js
@@ -271,3 +271,22 @@ test('breadcrumbs match jobs / job / task group / allocation / task', function(a
);
});
});
+
+moduleForAcceptance('Acceptance | task detail (not running)', {
+ beforeEach() {
+ server.create('agent');
+ server.create('node');
+ server.create('namespace');
+ server.create('namespace', { id: 'other-namespace' });
+ server.create('job', { createAllocations: false, namespaceId: 'other-namespace' });
+ allocation = server.create('allocation', 'withTaskWithPorts', { clientStatus: 'complete' });
+ task = server.db.taskStates.where({ allocationId: allocation.id })[0];
+
+ Task.visit({ id: allocation.id, name: task.name });
+ },
+});
+
+test('when the allocation for a task is not running, the resource utilization graphs are replaced by an empty message', function(assert) {
+ assert.equal(Task.resourceCharts.length, 0, 'No resource charts');
+ assert.equal(Task.resourceEmptyMessage, "Task isn't running", 'Empty message is appropriate');
+});
diff --git a/ui/tests/acceptance/task-group-detail-test.js b/ui/tests/acceptance/task-group-detail-test.js
index 13f2d71ba..5f2efaab2 100644
--- a/ui/tests/acceptance/task-group-detail-test.js
+++ b/ui/tests/acceptance/task-group-detail-test.js
@@ -33,6 +33,7 @@ moduleForAcceptance('Acceptance | task group detail', {
allocations = server.createList('allocation', 2, {
jobId: job.id,
taskGroup: taskGroup.name,
+ clientStatus: 'running',
});
// Allocations associated to a different task group on the job to
@@ -40,6 +41,7 @@ moduleForAcceptance('Acceptance | task group detail', {
server.createList('allocation', 3, {
jobId: job.id,
taskGroup: taskGroups[1].name,
+ clientStatus: 'running',
});
// Set a static name to make the search test deterministic
@@ -118,6 +120,7 @@ test('/jobs/:id/:task-group should list one page of allocations for the task gro
server.createList('allocation', TaskGroup.pageSize, {
jobId: job.id,
taskGroup: taskGroup.name,
+ clientStatus: 'running',
});
JobsList.visit();
diff --git a/ui/tests/integration/allocation-row-test.js b/ui/tests/integration/allocation-row-test.js
index a656732eb..a2204f621 100644
--- a/ui/tests/integration/allocation-row-test.js
+++ b/ui/tests/integration/allocation-row-test.js
@@ -7,6 +7,7 @@ import { startMirage } from 'nomad-ui/initializers/ember-cli-mirage';
import { find } from 'ember-native-dom-helpers';
import Response from 'ember-cli-mirage/response';
import { initialize as fragmentSerializerInitializer } from 'nomad-ui/initializers/fragment-serializer';
+import { Promise, resolve } from 'rsvp';
moduleForComponent('allocation-row', 'Integration | Component | allocation row', {
integration: true,
@@ -49,7 +50,7 @@ test('Allocation row polls for stats, even when it errors or has an invalid resp
return new Response(500, {}, '');
});
- this.server.create('allocation');
+ this.server.create('allocation', { clientStatus: 'running' });
this.store.findAll('allocation');
let allocation;
@@ -93,7 +94,7 @@ test('Allocation row shows warning when it requires drivers that are unhealthy o
});
node.update({ drivers });
- this.server.create('allocation');
+ this.server.create('allocation', { clientStatus: 'running' });
this.store.findAll('job');
this.store.findAll('node');
this.store.findAll('allocation');
@@ -120,3 +121,67 @@ test('Allocation row shows warning when it requires drivers that are unhealthy o
assert.ok(find('[data-test-icon="unhealthy-driver"]'), 'Unhealthy driver icon is shown');
});
});
+
+test('when an allocation is not running, the utilization graphs are omitted', function(assert) {
+ this.setProperties({
+ context: 'job',
+ enablePolling: false,
+ });
+
+ // All non-running statuses need to be tested
+ ['pending', 'complete', 'failed', 'lost'].forEach(clientStatus =>
+ this.server.create('allocation', { clientStatus })
+ );
+
+ this.store.findAll('allocation');
+
+ return wait().then(() => {
+ const allocations = this.store.peekAll('allocation');
+ return waitForEach(
+ allocations.map(allocation => () => {
+ this.set('allocation', allocation);
+ this.render(hbs`
+ {{allocation-row
+ allocation=allocation
+ context=context
+ enablePolling=enablePolling}}
+ `);
+ return wait().then(() => {
+ const status = allocation.get('clientStatus');
+ assert.notOk(find('[data-test-cpu] .inline-chart'), `No CPU chart for ${status}`);
+ assert.notOk(find('[data-test-mem] .inline-chart'), `No Mem chart for ${status}`);
+ });
+ })
+ );
+ });
+});
+
+// A way to loop over asynchronous code. Can be replaced by async/await in the future.
+const waitForEach = fns => {
+ let i = 0;
+ let done = () => {};
+
+ // This function is asynchronous and needs to return a promise
+ const pending = new Promise(resolve => {
+ done = resolve;
+ });
+
+ const step = () => {
+ // The waitForEach promise and this recursive loop are done once
+ // all functions have been called.
+ if (i >= fns.length) {
+ done();
+ return;
+ }
+ // Call the current function
+ const promise = fns[i]() || resolve(true);
+ // Increment the function position
+ i++;
+ // Wait for async behaviors to settle and repeat
+ promise.then(() => wait()).then(step);
+ };
+
+ step();
+
+ return pending;
+};
diff --git a/ui/tests/pages/allocations/detail.js b/ui/tests/pages/allocations/detail.js
index bc3bc165d..54ce5acca 100644
--- a/ui/tests/pages/allocations/detail.js
+++ b/ui/tests/pages/allocations/detail.js
@@ -28,6 +28,8 @@ export default create({
chartClass: attribute('class', '[data-test-percentage-chart] progress'),
}),
+ resourceEmptyMessage: text('[data-test-resource-error-headline]'),
+
tasks: collection('[data-test-task-row]', {
name: text('[data-test-name]'),
state: text('[data-test-state]'),
diff --git a/ui/tests/pages/allocations/task/detail.js b/ui/tests/pages/allocations/task/detail.js
index 249986cfb..9e5c0a60b 100644
--- a/ui/tests/pages/allocations/task/detail.js
+++ b/ui/tests/pages/allocations/task/detail.js
@@ -30,6 +30,8 @@ export default create({
chartClass: attribute('class', '[data-test-percentage-chart] progress'),
}),
+ resourceEmptyMessage: text('[data-test-resource-error-headline]'),
+
hasAddresses: isPresent('[data-test-task-addresses]'),
addresses: collection('[data-test-task-address]', {
name: text('[data-test-task-address-name]'),