Merge pull request #2544 from hashicorp/b-plan-panic

Fix a panic during plan evaluation
hashicorp · Apr 10, 2017 · d70313a · d70313a
2 parents 0d2e99b + 1526f10
commit d70313a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go
@@ -263,6 +263,7 @@ func evaluatePlan(pool *EvaluatePool, snap *state.StateSnapshot, plan *structs.P
 
 	// Evalute each node in the plan, handling results as they are ready to
 	// avoid blocking.
+OUTER:
 	for len(nodeIDList) > 0 {
 		nodeID := nodeIDList[0]
 		select {
@@ -276,7 +277,7 @@ func evaluatePlan(pool *EvaluatePool, snap *state.StateSnapshot, plan *structs.P
 			// which may save time processing additional entries.
 			if cancel := handleResult(r.nodeID, r.fit, r.err); cancel {
 				didCancel = true
-				break
+				break OUTER
 			}
 		}
 	}