Added isolation groups for common used internal tasks

conductor-oss · Jul 19, 2024 · 217692a · 217692a
1 parent 4e604c7
commit 217692a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/InlineTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/InlineTaskMapper.java
@@ -75,6 +75,9 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         inlineTask.setTaskType(TaskType.TASK_TYPE_INLINE);
         inlineTask.setStartTime(System.currentTimeMillis());
         inlineTask.setInputData(taskInput);
+        if (taskMapperContext.getTaskDefinition().getIsolationGroupId() != null) {
+            inlineTask.setIsolationGroupId(taskMapperContext.getTaskDefinition().getIsolationGroupId());
+        }
         inlineTask.setStatus(TaskModel.Status.IN_PROGRESS);
 
         return List.of(inlineTask);

diff --git a/.../src/main/java/com/netflix/conductor/core/execution/mapper/JsonJQTransformTaskMapper.java b/.../src/main/java/com/netflix/conductor/core/execution/mapper/JsonJQTransformTaskMapper.java
@@ -65,6 +65,9 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         TaskModel jsonJQTransformTask = taskMapperContext.createTaskModel();
         jsonJQTransformTask.setStartTime(System.currentTimeMillis());
         jsonJQTransformTask.setInputData(taskInput);
+        if (taskMapperContext.getTaskDefinition().getIsolationGroupId() != null) {
+            jsonJQTransformTask.setIsolationGroupId(taskMapperContext.getTaskDefinition().getIsolationGroupId());
+        }
         jsonJQTransformTask.setStatus(TaskModel.Status.IN_PROGRESS);
 
         return List.of(jsonJQTransformTask);

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java b/core/src/main/java/com/netflix/conductor/core/execution/mapper/WaitTaskMapper.java
@@ -79,6 +79,9 @@ public List<TaskModel> getMappedTasks(TaskMapperContext taskMapperContext) {
         waitTask.setInputData(waitTaskInput);
         waitTask.setStartTime(System.currentTimeMillis());
         waitTask.setStatus(TaskModel.Status.IN_PROGRESS);
+        if (taskMapperContext.getTaskDefinition().getIsolationGroupId() != null) {
+            waitTask.setIsolationGroupId(taskMapperContext.getTaskDefinition().getIsolationGroupId());
+        }
         setCallbackAfter(waitTask);
         return List.of(waitTask);
     }

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java b/core/src/main/java/com/netflix/conductor/core/execution/tasks/Wait.java
@@ -31,6 +31,11 @@ public Wait() {
         super(TASK_TYPE_WAIT);
     }
 
+    @Override
+    public void start(WorkflowModel workflow, TaskModel task, WorkflowExecutor executor) {
+        task.setStatus(TaskModel.Status.IN_PROGRESS);
+    }
+
     @Override
     public void cancel(WorkflowModel workflow, TaskModel task, WorkflowExecutor workflowExecutor) {
         task.setStatus(TaskModel.Status.CANCELED);