From bc0766967163a9f3461febf24c08151b9a1c425e Mon Sep 17 00:00:00 2001 From: Juanadelacuesta <8647634+Juanadelacuesta@users.noreply.github.com> Date: Mon, 4 May 2026 11:15:08 +0200 Subject: [PATCH 1/2] fix: update tests to remove the unused parameter --- scheduler/util_test.go | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/scheduler/util_test.go b/scheduler/util_test.go index 1fd73fcdfc0..5db2e54ce6c 100644 --- a/scheduler/util_test.go +++ b/scheduler/util_test.go @@ -613,26 +613,17 @@ func TestSetStatus(t *testing.T) { eval := mock.Eval() status := "a" desc := "b" - must.NoError(t, setStatus(logger, h, eval, nil, nil, nil, nil, status, desc, nil, "")) + must.NoError(t, setStatus(logger, h, eval, nil, nil, nil, status, desc, nil, "")) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) newEval := h.Evals[0] must.True(t, newEval.ID == eval.ID && newEval.Status == status && newEval.StatusDescription == desc, must.Sprintf("setStatus() submited invalid eval: %v", newEval)) - // Test next evals - h = tests.NewHarness(t) - next := mock.Eval() - must.NoError(t, setStatus(logger, h, eval, next, nil, nil, nil, status, desc, nil, "")) - must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) - - newEval = h.Evals[0] - must.Eq(t, next.ID, newEval.NextEval, must.Sprintf("setStatus() didn't set nextEval correctly: %v", newEval)) - // Test blocked evals h = tests.NewHarness(t) blocked := mock.Eval() - must.NoError(t, setStatus(logger, h, eval, nil, blocked, nil, nil, status, desc, nil, "")) + must.NoError(t, setStatus(logger, h, eval, blocked, nil, nil, status, desc, nil, "")) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) newEval = h.Evals[0] @@ -641,7 +632,7 @@ func TestSetStatus(t *testing.T) { // Test metrics h = tests.NewHarness(t) metrics := map[string]*structs.AllocMetric{"foo": nil} - must.NoError(t, setStatus(logger, h, eval, nil, nil, metrics, nil, status, desc, nil, "")) + must.NoError(t, setStatus(logger, h, eval, nil, metrics, nil, status, desc, nil, "")) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) newEval = h.Evals[0] @@ -652,7 +643,7 @@ func TestSetStatus(t *testing.T) { h = tests.NewHarness(t) queuedAllocs := map[string]int{"web": 1} - must.NoError(t, setStatus(logger, h, eval, nil, nil, metrics, nil, status, desc, queuedAllocs, "")) + must.NoError(t, setStatus(logger, h, eval, nil, metrics, nil, status, desc, queuedAllocs, "")) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) // Test annotations @@ -662,7 +653,7 @@ func TestSetStatus(t *testing.T) { PreemptedAllocs: []*structs.AllocListStub{{ID: uuid.Generate()}}, } - must.NoError(t, setStatus(logger, h, eval, nil, nil, metrics, annotations, status, desc, queuedAllocs, "")) + must.NoError(t, setStatus(logger, h, eval, nil, metrics, annotations, status, desc, queuedAllocs, "")) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) newEval = h.Evals[0] @@ -670,7 +661,7 @@ func TestSetStatus(t *testing.T) { h = tests.NewHarness(t) dID := uuid.Generate() - must.NoError(t, setStatus(logger, h, eval, nil, nil, metrics, nil, status, desc, queuedAllocs, dID)) + must.NoError(t, setStatus(logger, h, eval, nil, metrics, nil, status, desc, queuedAllocs, dID)) must.Eq(t, 1, len(h.Evals), must.Sprintf("setStatus() didn't update plan: %v", h.Evals)) newEval = h.Evals[0] From 8f84cb5dfcee641dfae3a041d6d9f9ff3e3eeac1 Mon Sep 17 00:00:00 2001 From: Juanadelacuesta <8647634+Juanadelacuesta@users.noreply.github.com> Date: Thu, 9 Apr 2026 18:51:17 +0200 Subject: [PATCH 2/2] style: remove unused parameter from scheduler/utils/setStatus --- scheduler/generic_sched.go | 6 +++--- scheduler/scheduler_sysbatch.go | 6 +++--- scheduler/scheduler_system.go | 6 +++--- scheduler/util.go | 6 ++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/scheduler/generic_sched.go b/scheduler/generic_sched.go index d9532ce3e8a..3ac133ed761 100644 --- a/scheduler/generic_sched.go +++ b/scheduler/generic_sched.go @@ -129,7 +129,7 @@ func (s *GenericScheduler) Process(eval *structs.Evaluation) (err error) { default: desc := fmt.Sprintf("scheduler cannot handle '%s' evaluation reason", eval.TriggeredBy) - return setStatus(s.logger, s.planner, s.eval, nil, s.blocked, + return setStatus(s.logger, s.planner, s.eval, s.blocked, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusFailed, desc, s.queuedAllocs, s.deployment.GetID()) } @@ -148,7 +148,7 @@ func (s *GenericScheduler) Process(eval *structs.Evaluation) (err error) { if err := s.createBlockedEval(true); err != nil { mErr.Errors = append(mErr.Errors, err) } - if err := setStatus(s.logger, s.planner, s.eval, nil, s.blocked, + if err := setStatus(s.logger, s.planner, s.eval, s.blocked, s.failedTGAllocs, s.planAnnotations, statusErr.EvalStatus, err.Error(), s.queuedAllocs, s.deployment.GetID()); err != nil { mErr.Errors = append(mErr.Errors, err) @@ -170,7 +170,7 @@ func (s *GenericScheduler) Process(eval *structs.Evaluation) (err error) { } // Update the status to complete - return setStatus(s.logger, s.planner, s.eval, nil, s.blocked, + return setStatus(s.logger, s.planner, s.eval, s.blocked, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusComplete, "", s.queuedAllocs, s.deployment.GetID()) } diff --git a/scheduler/scheduler_sysbatch.go b/scheduler/scheduler_sysbatch.go index 0b88bb7831a..8b9e9bc4a7a 100644 --- a/scheduler/scheduler_sysbatch.go +++ b/scheduler/scheduler_sysbatch.go @@ -78,7 +78,7 @@ func (s *SysBatchScheduler) Process(eval *structs.Evaluation) (err error) { // Verify the evaluation trigger reason is understood if !s.canHandle(eval.TriggeredBy) { desc := fmt.Sprintf("scheduler cannot handle '%s' evaluation reason", eval.TriggeredBy) - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusFailed, desc, s.queuedAllocs, "") } @@ -89,7 +89,7 @@ func (s *SysBatchScheduler) Process(eval *structs.Evaluation) (err error) { progress := func() bool { return progressMade(s.planResult) } if err := retryMax(limit, s.process, progress); err != nil { if statusErr, ok := err.(*SetStatusError); ok { - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, statusErr.EvalStatus, err.Error(), s.queuedAllocs, "") } @@ -97,7 +97,7 @@ func (s *SysBatchScheduler) Process(eval *structs.Evaluation) (err error) { } // Update the status to complete - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusComplete, "", s.queuedAllocs, "") } diff --git a/scheduler/scheduler_system.go b/scheduler/scheduler_system.go index d921ea8def6..9fd17ab625b 100644 --- a/scheduler/scheduler_system.go +++ b/scheduler/scheduler_system.go @@ -87,7 +87,7 @@ func (s *SystemScheduler) Process(eval *structs.Evaluation) (err error) { // Verify the evaluation trigger reason is understood if !s.canHandle(eval.TriggeredBy) { desc := fmt.Sprintf("scheduler cannot handle '%s' evaluation reason", eval.TriggeredBy) - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusFailed, desc, s.queuedAllocs, s.deployment.GetID()) } @@ -98,7 +98,7 @@ func (s *SystemScheduler) Process(eval *structs.Evaluation) (err error) { progress := func() bool { return progressMade(s.planResult) } if err := retryMax(limit, s.process, progress); err != nil { if statusErr, ok := err.(*SetStatusError); ok { - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, statusErr.EvalStatus, err.Error(), s.queuedAllocs, s.deployment.GetID()) } @@ -106,7 +106,7 @@ func (s *SystemScheduler) Process(eval *structs.Evaluation) (err error) { } // Update the status to complete - return setStatus(s.logger, s.planner, s.eval, nil, nil, + return setStatus(s.logger, s.planner, s.eval, nil, s.failedTGAllocs, s.planAnnotations, structs.EvalStatusComplete, "", s.queuedAllocs, s.deployment.GetID()) } diff --git a/scheduler/util.go b/scheduler/util.go index 0af7dd72de9..b461c0834ba 100644 --- a/scheduler/util.go +++ b/scheduler/util.go @@ -542,7 +542,7 @@ func renderTemplatesUpdated(a, b *structs.RestartPolicy, msg string) comparison // setStatus is used to update the status of the evaluation func setStatus(logger log.Logger, planner sstructs.Planner, - eval, nextEval, spawnedBlocked *structs.Evaluation, + eval, spawnedBlocked *structs.Evaluation, tgMetrics map[string]*structs.AllocMetric, annotations *structs.PlanAnnotations, status, desc string, @@ -554,9 +554,7 @@ func setStatus(logger log.Logger, planner sstructs.Planner, newEval.StatusDescription = desc newEval.DeploymentID = deploymentID newEval.FailedTGAllocs = tgMetrics - if nextEval != nil { - newEval.NextEval = nextEval.ID - } + if spawnedBlocked != nil { newEval.BlockedEval = spawnedBlocked.ID }