feature: Job 支持容器执行 - 脚本任务 TencentBlueKing#2631

wangyu096 · Feb 19, 2024 · 4e217ce · 4e217ce
1 parent b930a84
commit 4e217ce
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java b/...execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskExecuteServiceImpl.java
@@ -349,8 +349,7 @@ private TaskInstanceExecuteObjects processExecuteObjects(TaskInstanceDTO taskIns
             acquireAndSetHosts(taskInstanceExecuteObjects, taskInstance, stepInstanceList, variables);
             acquireAndSetContainers(taskInstanceExecuteObjects, taskInstance, stepInstanceList);
             boolean isSupportExecuteObjectFeature = isSupportExecuteObjectFeature(taskInstance);
-            stepInstanceList.forEach(stepInstance ->
-                stepInstance.buildStepFinalExecuteObjects(isSupportExecuteObjectFeature));
+            mergeExecuteObjects(stepInstanceList, variables, isSupportExecuteObjectFeature);
             checkExecuteObjectExist(taskInstanceExecuteObjects);
             watch.stop();
 
@@ -381,6 +380,21 @@ private TaskInstanceExecuteObjects processExecuteObjects(TaskInstanceDTO taskIns
         }
     }
 
+    private void mergeExecuteObjects(List<StepInstanceDTO> stepInstanceList,
+                                     Collection<TaskVariableDTO> variables,
+                                     boolean isSupportExecuteObjectFeature) {
+        stepInstanceList.forEach(stepInstance ->
+            stepInstance.buildStepFinalExecuteObjects(isSupportExecuteObjectFeature));
+        if (CollectionUtils.isNotEmpty(variables)) {
+            variables.forEach(variable -> {
+                if (TaskVariableTypeEnum.HOST_LIST.getType() == variable.getType()
+                    && variable.getTargetServers() != null) {
+                    variable.getTargetServers().buildMergedExecuteObjects(isSupportExecuteObjectFeature);
+                }
+            });
+        }
+    }
+
     private boolean isSupportExecuteObjectFeature(TaskInstanceDTO taskInstance) {
         FeatureExecutionContext featureExecutionContext =
             FeatureExecutionContext.builder()