backport of commit ec17aab (#16653)

This pull request was automerged via backport-assistant
hashicorp · Mar 27, 2023 · 44664f7 · 44664f7
1 parent 55251b7
commit 44664f7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/nomad/leader.go b/nomad/leader.go
@@ -740,7 +740,7 @@ func (s *Server) restorePeriodicDispatcher() error {
 			continue
 		}
 
-		if _, err := s.periodicDispatcher.ForceRun(job.Namespace, job.ID); err != nil {
+		if _, err := s.periodicDispatcher.ForceEval(job.Namespace, job.ID); err != nil {
 			logger.Error("force run of periodic job failed", "job", job.NamespacedID(), "error", err)
 			return fmt.Errorf("force run of periodic job %q failed: %v", job.NamespacedID(), err)
 		}

diff --git a/nomad/periodic.go b/nomad/periodic.go
@@ -295,9 +295,9 @@ func (p *PeriodicDispatch) removeLocked(jobID structs.NamespacedID) error {
 	return nil
 }
 
-// ForceRun causes the periodic job to be evaluated immediately and returns the
+// ForceEval causes the periodic job to be evaluated immediately and returns the
 // subsequent eval.
-func (p *PeriodicDispatch) ForceRun(namespace, jobID string) (*structs.Evaluation, error) {
+func (p *PeriodicDispatch) ForceEval(namespace, jobID string) (*structs.Evaluation, error) {
 	p.l.Lock()
 
 	// Do nothing if not enabled

diff --git a/nomad/periodic_endpoint.go b/nomad/periodic_endpoint.go
@@ -57,7 +57,7 @@ func (p *Periodic) Force(args *structs.PeriodicForceRequest, reply *structs.Peri
 	}
 
 	// Force run the job.
-	eval, err := p.srv.periodicDispatcher.ForceRun(args.RequestNamespace(), job.ID)
+	eval, err := p.srv.periodicDispatcher.ForceEval(args.RequestNamespace(), job.ID)
 	if err != nil {
 		return fmt.Errorf("force launch for job %q failed: %v", job.ID, err)
 	}

diff --git a/nomad/periodic_test.go b/nomad/periodic_test.go
@@ -356,16 +356,16 @@ func TestPeriodicDispatch_Remove_TriggersUpdate(t *testing.T) {
 	}
 }
 
-func TestPeriodicDispatch_ForceRun_Untracked(t *testing.T) {
+func TestPeriodicDispatch_ForceEval_Untracked(t *testing.T) {
 	ci.Parallel(t)
 	p, _ := testPeriodicDispatcher(t)
 
-	if _, err := p.ForceRun("ns", "foo"); err == nil {
-		t.Fatal("ForceRun of untracked job should fail")
+	if _, err := p.ForceEval("ns", "foo"); err == nil {
+		t.Fatal("ForceEval of untracked job should fail")
 	}
 }
 
-func TestPeriodicDispatch_ForceRun_Tracked(t *testing.T) {
+func TestPeriodicDispatch_ForceEval_Tracked(t *testing.T) {
 	ci.Parallel(t)
 	p, m := testPeriodicDispatcher(t)
 
@@ -377,9 +377,9 @@ func TestPeriodicDispatch_ForceRun_Tracked(t *testing.T) {
 		t.Fatalf("Add failed %v", err)
 	}
 
-	// ForceRun the job
-	if _, err := p.ForceRun(job.Namespace, job.ID); err != nil {
-		t.Fatalf("ForceRun failed %v", err)
+	// ForceEval the job
+	if _, err := p.ForceEval(job.Namespace, job.ID); err != nil {
+		t.Fatalf("ForceEval failed %v", err)
 	}
 
 	// Check that job was launched correctly.