Merge branch 'master' into electra-support

pk910 · pk910 · commit 13438c91cdc5 · 2024-09-18T11:00:15.000+02:00
diff --git a/pkg/coordinator/scheduler/task_state.go b/pkg/coordinator/scheduler/task_state.go
@@ -80,6 +80,9 @@ func (ts *TaskScheduler) newTaskState(options *types.TaskOptions, parentState *t
 	}
 
 	// create task state
+	ts.taskStateMutex.Lock()
+	defer ts.taskStateMutex.Unlock()
+
 	taskIdx := ts.taskCount
 	taskState := &taskState{
 		index:       taskIdx,
@@ -110,16 +113,13 @@ func (ts *TaskScheduler) newTaskState(options *types.TaskOptions, parentState *t
 
 	ts.taskCount++
 
-	// create internal execution state
-	ts.taskStateMutex.Lock()
 	ts.taskStateMap[taskIdx] = taskState
 
 	if isCleanupTask {
 		ts.allCleanupTasks = append(ts.allCleanupTasks, taskIdx)
 	} else {
 		ts.allTasks = append(ts.allTasks, taskIdx)
 	}
-	ts.taskStateMutex.Unlock()
 
 	return taskState, nil
 }
