Fix linting and better comments

hashicorp · Sep 24, 2018 · 282a027 · 282a027
1 parent 992c243
commit 282a027
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nomad/plan_apply.go b/nomad/plan_apply.go
@@ -176,7 +176,7 @@ func (s *Server) applyPlan(plan *structs.Plan, result *structs.PlanResult, snap
 	}
 
 	var evals []*structs.Evaluation
-	for preemptedJobID, _ := range preemptedJobIDs {
+	for preemptedJobID := range preemptedJobIDs {
 		job, _ := s.State().JobByID(nil, preemptedJobID.Namespace, preemptedJobID.ID)
 		if job != nil {
 			eval := &structs.Evaluation{

diff --git a/scheduler/preemption.go b/scheduler/preemption.go
@@ -363,7 +363,6 @@ func preemptForNetworkResourceAsk(jobPriority int, currentAllocs []*structs.Allo
 
 		// If bandwidth requirements have been met, stop
 		if preemptedBandwidth+freeBandwidth >= MbitsNeeded {
-			met = true
 			break
 		}
 
@@ -407,10 +406,12 @@ func preemptForNetworkResourceAsk(jobPriority int, currentAllocs []*structs.Allo
 					break
 				}
 			}
+			// If we met bandwidth needs we can break out of loop that's iterating by priority within a device
 			if met {
 				break
 			}
 		}
+		// If we met bandwidth needs we can break out of loop that's iterating by allocs sharing the same network device
 		if met {
 			break
 		}