JobContext Should Not Report Leased Returned Jobs As Away (#3999)

* fix job state Signed-off-by: Chris Martin <chris@cmartinit.co.uk> * add test Signed-off-by: Chris Martin <chris@cmartinit.co.uk> --------- Signed-off-by: Chris Martin <chris@cmartinit.co.uk>
armadaproject · Oct 11, 2024 · a6f6af7 · a6f6af7
1 parent 7248240
commit a6f6af7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/internal/scheduler/scheduling/context/job.go b/internal/scheduler/scheduling/context/job.go
@@ -63,9 +63,9 @@ type JobSchedulingContext struct {
 }
 
 func (jctx *JobSchedulingContext) IsHomeJob(currentPool string) bool {
-	// Away jobs will only even be evicted in this round - and by definition have a run
-	// Therefore any job without a run we can assume is a home job
-	if jctx.Job.LatestRun() == nil {
+	// Away jobs  can never have been scheduled in this round
+	// and therefore must have an active run
+	if jctx.Job.Queued() || jctx.Job.LatestRun() == nil {
 		return true
 	}
 	return jctx.Job.LatestRun().Pool() == currentPool

diff --git a/internal/scheduler/scheduling/context/job_test.go b/internal/scheduler/scheduling/context/job_test.go
@@ -41,4 +41,9 @@ func TestJobSchedulingContext_IsHomePool(t *testing.T) {
 	job = job.WithNewRun("executor", "node-id", "node", "other", 1)
 	jctx = &JobSchedulingContext{Job: job}
 	assert.False(t, jctx.IsHomeJob(testfixtures.TestPool))
+
+	// Add returned run for a different pool
+	job = job.WithNewRun("executor", "node-id", "node", "other", 1).WithQueued(true)
+	jctx = &JobSchedulingContext{Job: job}
+	assert.True(t, jctx.IsHomeJob(testfixtures.TestPool))
 }