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

Change down to highest-priority composite status (#9927) 

As pointed out by Nick Ethier, if a node was ineligible before
it went down, downness should be displayed, not ineligibility.
This commit is contained in:
Buck Doyle 2021-02-01 12:00:34 -06:00 committed by GitHub
parent 3a325be742
commit 8d1f823c34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/models/node.js
View File

@ -102,7 +102,9 @@ export default class Node extends Model {
// Useful for coloring and sorting nodes
@computed('isDraining', 'isEligible', 'status')
get compositeStatus() {
if (this.isDraining) {
if (this.status === 'down') {
return 'down';
} else if (this.isDraining) {
return 'draining';
} else if (!this.isEligible) {
return 'ineligible';

1
ui/tests/acceptance/client-detail-test.js
View File

@ -457,6 +457,7 @@ module('Acceptance | client detail', function(hooks) {
node = server.create('node', {
drain: false,
schedulingEligibility: 'ineligible',
status: 'ready',
});
await ClientDetail.visit({ id: node.id });

30
ui/tests/acceptance/clients-list-test.js
View File

@ -46,7 +46,10 @@ module('Acceptance | clients list', function(hooks) {
});
test('each client record should show high-level info of the client', async function(assert) {
const node = server.create('node', 'draining');
const node = server.create('node', 'draining', {
status: 'ready',
});
server.createList('agent', 1);
await ClientsList.visit();
@ -99,21 +102,27 @@ module('Acceptance | clients list', function(hooks) {
server.createList('agent', 1);
server.create('node', {
modifyIndex: 4,
modifyIndex: 5,
status: 'ready',
schedulingEligibility: 'eligible',
drain: false,
});
server.create('node', {
modifyIndex: 3,
modifyIndex: 4,
status: 'initializing',
schedulingEligibility: 'eligible',
drain: false,
});
server.create('node', {
modifyIndex: 3,
status: 'down',
schedulingEligibility: 'eligible',
drain: false,
});
server.create('node', {
modifyIndex: 2,
status: 'down',
schedulingEligibility: 'eligible',
schedulingEligibility: 'ineligible',
drain: false,
});
server.create('node', {
@ -137,12 +146,13 @@ module('Acceptance | clients list', function(hooks) {
assert.equal(ClientsList.nodes[1].compositeStatus.text, 'initializing');
assert.equal(ClientsList.nodes[2].compositeStatus.text, 'down');
assert.equal(ClientsList.nodes[2].compositeStatus.text, 'down', 'down takes priority over ineligible');
assert.equal(ClientsList.nodes[3].compositeStatus.text, 'ineligible');
assert.ok(ClientsList.nodes[3].compositeStatus.isWarning, 'expected warning class');
assert.equal(ClientsList.nodes[4].compositeStatus.text, 'ineligible');
assert.ok(ClientsList.nodes[4].compositeStatus.isWarning, 'expected warning class');
assert.equal(ClientsList.nodes[4].compositeStatus.text, 'draining');
assert.ok(ClientsList.nodes[4].compositeStatus.isInfo, 'expected info class');
assert.equal(ClientsList.nodes[5].compositeStatus.text, 'draining');
assert.ok(ClientsList.nodes[5].compositeStatus.isInfo, 'expected info class');
await ClientsList.sortBy('compositeStatus');
@ -152,13 +162,14 @@ module('Acceptance | clients list', function(hooks) {
'ineligible',
'draining',
'down',
'down',
]);
// Simulate a client state change arriving through polling
let readyClient = this.owner
.lookup('service:store')
.peekAll('node')
.findBy('modifyIndex', 4);
.findBy('modifyIndex', 5);
readyClient.set('schedulingEligibility', 'ineligible');
await settled();
@ -169,6 +180,7 @@ module('Acceptance | clients list', function(hooks) {
'ineligible',
'draining',
'down',
'down',
]);
});