Cleanup

buildbuddy-io · Jan 16, 2025 · 1688dae · 1688dae
1 parent 4d91abe
commit 1688dae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/enterprise/server/scheduling/scheduler_server/scheduler_server.go b/enterprise/server/scheduling/scheduler_server/scheduler_server.go
@@ -2027,10 +2027,11 @@ func (s *SchedulerServer) reEnqueueTask(ctx context.Context, taskID, leaseID, re
 		if _, err := s.deleteTask(ctx, taskID); err != nil {
 			return err
 		}
+		msg := fmt.Sprintf("Task %q does not have retries enabled. Not re-enqueuing. Last failure: %s", taskID, reason)
 		if err := s.env.GetRemoteExecutionService().MarkExecutionFailed(ctx, taskID, status.InternalError(msg)); err != nil {
 			log.CtxWarningf(ctx, "Could not mark execution failed for task %q: %s", taskID, err)
 		}
-		log.Infof("Task %q does not have retries enabled. Not re-enqueing. Last failure: %s", taskID, reason)
+		log.Infof(msg)
 		return nil
 	}
 

diff --git a/enterprise/server/scheduling/scheduler_server/scheduler_server_test.go b/enterprise/server/scheduling/scheduler_server/scheduler_server_test.go
@@ -558,13 +558,17 @@ func TestExecutorReEnqueue_RetriesDisabled(t *testing.T) {
 	taskID := scheduleTask(ctx, t, env, map[string]string{platform.ShouldRetryPropertyName: "false"})
 	fe.WaitForTask(taskID)
 	lease := fe.Claim(taskID)
+	fe.ResetTasks()
 
 	_, err := env.GetSchedulerClient().ReEnqueueTask(ctx, &scpb.ReEnqueueTaskRequest{
 		TaskId:  taskID,
 		Reason:  "for fun",
 		LeaseId: lease.leaseID,
 	})
-	require.Error(t, err)
+	require.NoError(t, err)
+
+	// Ensure the task was never re-enqueued
+	fe.EnsureTaskNotReceived(taskID)
 }
 
 func TestLeaseExpiration(t *testing.T) {