System jobs without evals are running too

hashicorp · Jul 3, 2017 · cd9da16 · cd9da16
1 parent 3f50e71
commit cd9da16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/nomad/state/state_store.go b/nomad/state/state_store.go
@@ -2130,14 +2130,8 @@ func (s *StateStore) getJobStatus(txn *memdb.Txn, job *structs.Job, evalDelete b
 			return structs.JobStatusDead, nil
 		}
 
-		if hasEval {
-			// At least one completed eval
-			return structs.JobStatusRunning, nil
-		}
-
 		// Pending until at least one eval has completed
-		return structs.JobStatusPending, nil
-
+		return structs.JobStatusRunning, nil
 	}
 
 	// The job is dead if all the allocations and evals are terminal or if there

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -1635,6 +1635,7 @@ func TestStateStore_JobsByScheduler(t *testing.T) {
 
 	for i := 0; i < 10; i++ {
 		job := mock.SystemJob()
+		job.Status = structs.JobStatusRunning
 		sysJobs = append(sysJobs, job)
 
 		err := state.UpsertJob(2000+uint64(i), job)