Make sure a canceled job does not start

Flowpack · Jul 11, 2023 · 3642685 · 3642685
1 parent b24cfbe
commit 3642685
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/prunner.go b/prunner.go
@@ -365,6 +365,10 @@ func (r *PipelineRunner) ReadJob(id uuid.UUID, process func(j *PipelineJob)) err
 func (r *PipelineRunner) startJob(job *PipelineJob) {
 	defer r.requestPersist()
 
+	if job.Canceled {
+		return
+	}
+
 	r.initScheduler(job)
 
 	graph, err := buildPipelineGraph(job.ID, job.Tasks, job.Variables)

diff --git a/prunner_test.go b/prunner_test.go
@@ -297,8 +297,8 @@ func TestPipelineRunner_CancelJob_WithQueuedJob(t *testing.T) {
 	pRunner, err := NewPipelineRunner(ctx, defs, func(j *PipelineJob) taskctl.Runner {
 		return &test.MockRunner{
 			OnRun: func(t *task.Task) error {
-				jobID := t.Variables.Get(taskctl.JobIDVariableName)
 				mx.Lock()
+				jobID := t.Variables.Get(taskctl.JobIDVariableName)
 				startedJobsIDs = append(startedJobsIDs, jobID.(string))
 				mx.Unlock()
 
@@ -934,7 +934,7 @@ func TestPipelineRunner_Shutdown_WithRunningJob_Forced(t *testing.T) {
 				QueueLimit:  nil,
 				Tasks: map[string]definition.TaskDef{
 					"sleep": {
-						Script: []string{"sleep 1"},
+						Script: []string{"sleep 10"},
 					},
 				},
 				SourcePath: "fixtures",