kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

[ui] Fixes an issue where system jobs' status were set to Scaled Down when their allocs get garbage collected (#24620)

Browse Source 
* Fixes an issue where system jobs' status were set to Scaled Down when their allocs get garbage collected

* Added to aggregateAllocStatus acceptance test and changelog
This commit is contained in:
Phil Renaud
2024-12-17 01:01:19 -05:00
committed by GitHub
parent 22b7470ccf
commit 71e3716435
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/components/job-status/panel/steady.js
View File

@@ -224,7 +224,7 @@ export default class JobStatusPanelSteadyComponent extends Component {
};
}
if (this.totalAllocs === 0) {
if (this.totalAllocs === 0 && !this.job.hasClientStatus) {
return {
label: 'Scaled Down',
state: 'neutral',
@@ -246,7 +246,7 @@ export default class JobStatusPanelSteadyComponent extends Component {
}
const healthyAllocs = this.allocBlocks.running?.healthy?.nonCanary;
if (healthyAllocs?.length === totalAllocs) {
if (healthyAllocs?.length && healthyAllocs?.length === totalAllocs) {
return { label: 'Healthy', state: 'success' };
}

6
ui/app/models/job.js
View File

@@ -251,7 +251,11 @@ export default class Job extends Model {
// If the job is scaled down to 0 desired allocations, we shouldn't call it "failed";
// we should indicate that it is deliberately set to not have any running parts.
if (totalAllocs === 0) {
// System/Sysbatch jobs (hasClientStatus) get their totalAllocs from expectedRunningAllocCount,
// which is a best-guess-based-on-whats-running number. This means that if there are no current allocs,
// because they've been GC'd, we don't know if they were deliberately scaled down or failed.
// Safer in this case to show as failed rather than imply a deliberate scale-down.
if (totalAllocs === 0 && !this.hasClientStatus) {
return { label: 'Scaled Down', state: 'neutral' };
}

11
ui/tests/acceptance/jobs-list-test.js
View File

@@ -707,6 +707,14 @@ module('Acceptance | jobs list', function (hooks) {
status: 'dead',
});
server.create('job', {
...defaultJobParams,
id: 'ancient-system-job',
status: 'dead',
type: 'system',
groupAllocCount: 0,
});
await JobsList.visit();
assert
@@ -742,6 +750,9 @@ module('Acceptance | jobs list', function (hooks) {
assert
.dom('[data-test-job-row="scaled-down-job"] [data-test-job-status]')
.hasText('Scaled Down', 'Scaled down job is scaled down');
assert
.dom('[data-test-job-row="ancient-system-job"] [data-test-job-status]')
.hasText('Failed', 'System job with no allocs is failed');
await percySnapshot(assert);
});