Skip to content

Commit bb552dd

Browse files
authored
New statuses for job instance: Submitting and SubmissionTimeout (#414)
* #333 New statuses for job instance: Submitting and SubmissionTimeout
1 parent ea1e09b commit bb552dd

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

src/main/scala/za/co/absa/hyperdrive/trigger/models/enums/JobStatuses.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ object JobStatuses {
2828
case object Succeeded extends JobStatus("Succeeded", true, false, false)
2929
case object Failed extends JobStatus("Failed", true, true, false)
3030
case object Killed extends JobStatus("Killed", true, true, false)
31+
case object SubmissionTimeout extends JobStatus("Submission timeout", true, true, false)
3132
case object InvalidExecutor extends JobStatus("InvalidExecutor", true, true, false)
3233
case object FailedPreviousJob extends JobStatus("FailedPreviousJob", true, true, false)
3334
case object Skipped extends JobStatus("Skipped", true, false, false)
3435

35-
val statuses: Set[JobStatus] = Set(InQueue,Submitting,Running,Lost,Succeeded,Failed,Killed,InvalidExecutor,FailedPreviousJob,Skipped)
36+
val statuses: Set[JobStatus] = Set(InQueue,Submitting,Running,Lost,Succeeded,Failed,Killed,SubmissionTimeout,InvalidExecutor,FailedPreviousJob,Skipped)
3637
val finalStatuses: Set[JobStatus] = statuses.filter(!_.isFinalStatus)
3738
val nonFinalStatuses: Set[JobStatus] = statuses.filter(_.isFinalStatus)
3839
}

src/main/scala/za/co/absa/hyperdrive/trigger/scheduler/executors/spark/SparkExecutor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ object SparkExecutor extends Executor {
6565
case None => Seq.empty
6666
}) match {
6767
case Seq(first) => updateJob(jobInstance.copy(jobStatus = getStatus(first.finalStatus)))
68+
case _ if jobInstance.jobStatus == Submitting => updateJob(jobInstance.copy(jobStatus = SubmissionTimeout))
6869
case _ => updateJob(jobInstance.copy(jobStatus = Lost))
6970
}
7071
}

ui/src/app/components/runs/run-detail/run-detail.component.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
<clr-dg-cell>{{jobInstance.updated | date:'medium'}}</clr-dg-cell>
3030
<clr-dg-cell [ngSwitch]="jobInstance.jobStatus.name">
3131
<clr-icon *ngSwitchCase="jobStatuses.IN_QUEUE" shape="clock" class="is-solid" style="color: darkmagenta"></clr-icon>
32+
<clr-icon *ngSwitchCase="jobStatuses.SUBMITTING" shape="upload" class="is-solid" style="color: cornflowerblue"></clr-icon>
3233
<clr-icon *ngSwitchCase="jobStatuses.RUNNING" shape="play" class="is-solid" style="color: blue"></clr-icon>
3334
<clr-icon *ngSwitchCase="jobStatuses.SUCCEEDED" shape="success-standard" class="is-solid" style="color: green"></clr-icon>
3435
<clr-icon *ngSwitchCase="jobStatuses.FAILED" shape="error-standard" class="is-solid" style="color: red"></clr-icon>
3536
<clr-icon *ngSwitchCase="jobStatuses.SKIPPED" shape="fast-forward" class="is-solid" style="color: grey"></clr-icon>
37+
<clr-icon *ngSwitchCase="jobStatuses.SUBMISSION_TIMEOUT" shape="clock" class="has-badge is-solid" style="color: orangered"></clr-icon>
3638
<clr-icon *ngSwitchDefault shape="help" class="is-solid" style="color: darkgoldenrod"></clr-icon>
3739
{{jobInstance.jobStatus.name}}
3840
</clr-dg-cell>

ui/src/app/models/enums/jobStatuses.constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515

1616
export const jobStatuses = {
1717
IN_QUEUE: 'InQueue',
18+
SUBMITTING: 'Submitting',
1819
RUNNING: 'Running',
1920
SUCCEEDED: 'Succeeded',
2021
FAILED: 'Failed',
2122
SKIPPED: 'Skipped',
23+
SUBMISSION_TIMEOUT: 'Submission timeout',
2224
};

0 commit comments

Comments
 (0)