# Conflicts:
#	go.mod

@@ -5,7 +5,6 @@ package task_state_machine
 import (
 	"context"
 	"fmt"
-

@@ -180,6 +179,16 @@ func (sm *StateMachine) updateJobOnTaskStatusCanceled(ctx context.Context, logge
 		return sm.JobStatusChange(ctx, job, api.JobStatusCanceled, "canceled task was last runnable task of job, canceling job")
 	}
 
+	numActive, _, err := sm.persist.CountTasksOfJobInStatus(ctx, job, api.TaskStatusActive)

@@ -183,0 +185,4 @@
+	}
+	if numActive == 0 && job.Status == api.JobStatusPauseRequested {
+		// there is no active task, and the job is in pause-requested status, so we can pause the job
+		logger.Info().Msg("all tasks of job are completed, job is paused")

@@ -441,0 +479,4 @@
+	logger.Info().Msg("pausing tasks of job")
+
+	// Any task that might run in the future should get paused.
+	// Active jobs should remain active until finished

@@ -22,0 +24,4 @@
+      const activeJob = jobs.activeJob;
+
+      // Check if the job status is 'pause-requested'
+      if (activeJob && activeJob.status === 'pause-requested') {

@@ -22,0 +27,4 @@
+      if (activeJob && activeJob.status === 'pause-requested') {
+        return false;
+      }
+      // Allow cancellation for specified task statuses

@@ -207,0 +223,4 @@
+	if job.Status != api.JobStatusPauseRequested {
+		return sm.jobStatusIfAThenB(ctx, logger, job, api.JobStatusQueued, api.JobStatusActive,
+			"task failed, but not enough to fail the job")
+	} else {

@@ -166,6 +166,21 @@ func (sm *StateMachine) jobStatusIfAThenB(
 	return sm.JobStatusChange(ctx, job, thenStatus, reason)
 }
 
+func (sm *StateMachine) shouldJobBePaused(ctx context.Context, logger zerolog.Logger, job *persistence.Job) (bool, error) {

@@ -167,2 +167,4 @@
 }
 
+func (sm *StateMachine) shouldJobBePaused(ctx context.Context, logger zerolog.Logger, job *persistence.Job) (bool, error) {
+	if job.Status == api.JobStatusPauseRequested {

@@ -169,0 +174,4 @@
+		}
+		if numActive == 0 {
+			// There is no active task, and the job is in pause-requested status, so we can pause the job.
+			logger.Info().Msg("No more active tasks, job is paused")

@@ -441,0 +511,4 @@
+	// If pausing was requested, it has now happened, so the job can transition.
+	toBePaused, err := sm.shouldJobBePaused(ctx, logger, job)
+	if err != nil {
+		return "", fmt.Errorf("error when accessing number of active tasks")

@@ -441,0 +514,4 @@
+		return "", fmt.Errorf("error when accessing number of active tasks")
+	}
+	if toBePaused {
+		logger.Info().Msg("all tasks of job paused, job can go to 'paused' status")