state store: remove reschedulable check when getting job status (#25081)

Author: mismithhisler

nomad/state/state_store.go

@@ -5679,15 +5679,9 @@ func (s *StateStore) getJobStatus(txn *txn, job *structs.Job, evalDelete bool) (
 	// If there is a non-terminal allocation, the job is running.
 	hasAlloc := false
 	for alloc := allocs.Next(); alloc != nil; alloc = allocs.Next() {
-		a := alloc.(*structs.Allocation)
-		if !a.TerminalStatus() {
+		if !alloc.(*structs.Allocation).TerminalStatus() {
 			return structs.JobStatusRunning, nil
 		}
-		// if there exists a terminal, non-reschedulable alloc,
-		// mark this job as possibly dead
-		if !isReschedulable(a) {
-			hasAlloc = true
-		}
 	}
 
 	evals, err := txn.Get("evals", "job_prefix", job.Namespace, job.ID)
@@ -5697,18 +5691,8 @@ func (s *StateStore) getJobStatus(txn *txn, job *structs.Job, evalDelete bool) (
 
 	hasEval := false
 	for raw := evals.Next(); raw != nil; raw = evals.Next() {
-		e := raw.(*structs.Evaluation)
-
-		// Handles restarting stopped jobs and rescheduled allocs, or else they
-		// are briefly marked dead. We don't always want to skip these evaluations,
-		// like in the case of rescheduled or stopped jobs, but we handle both
-		// those cases in elsewhere in this function.
-		if e.JobModifyIndex < job.ModifyIndex {
-			continue
-		}
-
 		hasEval = true
-		if !e.TerminalStatus() {
+		if !raw.(*structs.Evaluation).TerminalStatus() {
 			return structs.JobStatusPending, nil
 		}
 	}
@@ -7421,13 +7405,6 @@ func (s *StateStore) ScalingPoliciesByIDPrefix(ws memdb.WatchSet, namespace stri
 	return iter, nil
 }
 
-func isReschedulable(a *structs.Allocation) bool {
-	if a.Job.Type != structs.JobTypeService {
-		return false
-	}
-	return a.RescheduleTracker.RescheduleEligible(a.ReschedulePolicy(), time.Now())
-}
-
 // scalingPolicyNamespaceFilter returns a filter function that filters all
 // scaling policies not targeting the given namespace.
 func scalingPolicyNamespaceFilter(namespace string) func(interface{}) bool {

nomad/state/state_store_test.go

@@ -7896,7 +7896,7 @@ func TestStateStore_GetJobStatus(t *testing.T) {
 			exp: structs.JobStatusPending,
 		},
 		{
-			name: "batch job has all terminal allocs, with no evals",
+			name: "batch job has all terminal allocs and terminal evals",
 			setup: func(t *testing.T, txn *txn) *structs.Job {
 				j := mock.Job()
 				j.Type = structs.JobTypeBatch
@@ -7908,6 +7908,12 @@ func TestStateStore_GetJobStatus(t *testing.T) {
 
 				err := txn.Insert("allocs", a)
 				must.NoError(t, err)
+
+				e := mock.Eval()
+				e.JobID = j.ID
+				e.Status = structs.EvalStatusComplete
+				err = txn.Insert("evals", e)
+				must.NoError(t, err)
 				return j
 			},
 			exp: structs.JobStatusDead,
@@ -7984,6 +7990,12 @@ func TestStateStore_GetJobStatus(t *testing.T) {
 
 				err = txn.Insert("allocs", a2)
 				must.NoError(t, err)
+
+				e := mock.Eval()
+				e.JobID = j.ID
+				e.Status = structs.EvalStatusComplete
+				err = txn.Insert("evals", e)
+				must.NoError(t, err)
 				return j
 			},
 			exp: structs.JobStatusDead,