Merge pull request #4474 from hashicorp/b-4463

scheduler: fixed nil panic and clearer error handling
hashicorp · Jul 11, 2018 · 4b84f0a · 4b84f0a
2 parents b8b3d03 + 3e7d430
commit 4b84f0a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/scheduler/generic_sched.go b/scheduler/generic_sched.go
@@ -592,14 +592,18 @@ func updateRescheduleTracker(alloc *structs.Allocation, prev *structs.Allocation
 }
 
 // findPreferredNode finds the preferred node for an allocation
-func (s *GenericScheduler) findPreferredNode(place placementResult) (node *structs.Node, err error) {
+func (s *GenericScheduler) findPreferredNode(place placementResult) (*structs.Node, error) {
 	if prev := place.PreviousAllocation(); prev != nil && place.TaskGroup().EphemeralDisk.Sticky == true {
 		var preferredNode *structs.Node
 		ws := memdb.NewWatchSet()
 		preferredNode, err = s.state.NodeByID(ws, prev.NodeID)
-		if preferredNode.Ready() {
-			node = preferredNode
+		if err != nil {
+			return nil, err
+		}
+
+		if preferredNode != nil && preferredNode.Ready() {
+			return preferredNode, nil
 		}
 	}
-	return
+	return nil, nil
 }