Only ignore rescheduled allocations if they got stopped

hashicorp · Sep 15, 2020 · a80ccb8 · a80ccb8
1 parent c6848d3
commit a80ccb8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/scheduler/reconcile_util.go b/scheduler/reconcile_util.go
@@ -256,8 +256,10 @@ func (a allocSet) filterByRescheduleable(isBatch bool, now time.Time, evalID str
 		var eligibleNow, eligibleLater bool
 		var rescheduleTime time.Time
 
-		// Ignore allocs that have already been rescheduled
-		if alloc.NextAllocation != "" {
+		// Ignore failing allocs that have already been rescheduled
+		// only failed allocs should be rescheduled, but protect against a bug allowing rescheduling
+		// running allocs
+		if alloc.NextAllocation != "" && alloc.TerminalStatus() {
 			continue
 		}