scheduler: simplify eviction logic

nomad/structs/structs.go

@@ -739,11 +739,13 @@ func (e *Evaluation) ShouldEnqueue() bool {
 func (e *Evaluation) MakePlan(j *Job) *Plan {
 	p := &Plan{
 		EvalID:         e.ID,
-		Priority:       j.Priority,
-		AllAtOnce:      j.AllAtOnce,
+		Priority:       e.Priority,
 		NodeEvict:      make(map[string][]string),
 		NodeAllocation: make(map[string][]*Allocation),
 	}
+	if j != nil {
+		p.AllAtOnce = j.AllAtOnce
+	}
 	return p
 }
 

scheduler/service_sched.go

@@ -317,11 +317,7 @@ START:
 	}
 
 	// Create a plan to evict these
-	plan := &structs.Plan{
-		EvalID:    eval.ID,
-		Priority:  eval.Priority,
-		NodeEvict: make(map[string][]string),
-	}
+	plan := eval.MakePlan(nil)
 
 	// Add each alloc to be evicted
 	for _, alloc := range allocs {