Include actual logic change

Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com>
armadaproject · Aug 12, 2024 · 46417da · 46417da
1 parent 1cca199
commit 46417da
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/internal/scheduler/metrics.go b/internal/scheduler/metrics.go
@@ -200,7 +200,14 @@ func (c *MetricsCollector) updateQueueMetrics(ctx *armadacontext.Context) ([]pro
 				continue
 			}
 			recorder = qs.queuedJobRecorder
-			timeInState = currentTime.Sub(time.Unix(0, job.Created()))
+			queuedTime := time.Unix(0, job.Created())
+			if job.HasRuns() {
+				terminationTimeOfLatestRun := job.LatestRun().TerminatedTime()
+				if terminationTimeOfLatestRun != nil && terminationTimeOfLatestRun.After(queuedTime) {
+					queuedTime = *terminationTimeOfLatestRun
+				}
+			}
+			timeInState = currentTime.Sub(queuedTime)
 			queuedJobsCount[job.Queue()]++
 			schedulingKeysByQueue[job.Queue()][job.SchedulingKey()] = true
 		} else {