Tim's comments

hashicorp · Dec 16, 2024 · 24ab149 · 24ab149
1 parent bfd9fbd
commit 24ab149
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/scheduler/generic_sched.go b/scheduler/generic_sched.go
@@ -942,8 +942,7 @@ func (s *GenericScheduler) findPreferredNode(place placementResult) (*structs.No
 		}
 
 		var preferredNode *structs.Node
-		ws := memdb.NewWatchSet()
-		preferredNode, err := s.state.NodeByID(ws, prev.NodeID)
+		preferredNode, err := s.state.NodeByID(nil, prev.NodeID)
 		if err != nil {
 			return nil, err
 		}

diff --git a/scheduler/generic_sched_test.go b/scheduler/generic_sched_test.go
@@ -316,13 +316,11 @@ func TestServiceSched_JobRegister_StickyVolumes(t *testing.T) {
 		Status:      structs.EvalStatusPending,
 	}
 	must.NoError(t, h.State.UpsertEvals(structs.MsgTypeTestSetup, h.NextIndex(), []*structs.Evaluation{eval}))
-	h1 := NewHarnessWithState(t, h.State)
-	must.NoError(t, h1.Process(NewServiceScheduler, eval))
+	must.NoError(t, h.Process(NewServiceScheduler, eval))
 
 	// Ensure we have created only one new allocation
-	// Ensure a single plan
-	must.SliceLen(t, 1, h1.Plans)
-	plan = h1.Plans[0]
+	must.SliceLen(t, 2, h.Plans)
+	plan = h.Plans[0]
 	var newPlanned []*structs.Allocation
 	for _, allocList := range plan.NodeAllocation {
 		newPlanned = append(newPlanned, allocList...)
@@ -331,7 +329,6 @@ func TestServiceSched_JobRegister_StickyVolumes(t *testing.T) {
 
 	// Ensure that the new allocations retain the host volume ID
 	for _, new := range newPlanned {
-		must.NotEq(t, new.PreviousAllocation, "")
 		must.Eq(t, new.HostVolumeIDs[0], dhv.ID)
 	}
 }

diff --git a/scheduler/stack.go b/scheduler/stack.go
@@ -39,7 +39,6 @@ type SelectOptions struct {
 	PreferredNodes          []*structs.Node
 	Preempt                 bool
 	AllocName               string
-	AllocID                 string
 	AllocationHostVolumeIDs []string
 }