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

wangyu096 · Jan 26, 2024 · d99f7ea · d99f7ea
1 parent 67352e8
commit d99f7ea
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 31 deletions.
diff --git a/...rc/test/java/com/tencent/bk/job/execute/dao/impl/RollingConfigDAOImplIntegrationTest.java b/...rc/test/java/com/tencent/bk/job/execute/dao/impl/RollingConfigDAOImplIntegrationTest.java
@@ -72,7 +72,8 @@ void queryRollingConfig() {
         assertThat(savedTaskInstanceRollingConfig.getTaskInstanceId()).isEqualTo(1L);
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail()).isNotNull();
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExpr()).isEqualTo("1 10% 100%");
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getMode()).isEqualTo(RollingModeEnum.PAUSE_IF_FAIL.getValue());
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getMode())
+            .isEqualTo(RollingModeEnum.PAUSE_IF_FAIL.getValue());
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getName()).isEqualTo("config1");
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getStepRollingConfigs()).hasSize(4);
         Map<Long, StepRollingConfigDO> stepRollingConfigs =
@@ -82,20 +83,34 @@ void queryRollingConfig() {
         assertThat(stepRollingConfigs.get(102L).isBatch()).isEqualTo(true);
         assertThat(stepRollingConfigs.get(103L).isBatch()).isEqualTo(true);
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly()).hasSize(3);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getBatch()).isEqualTo(1);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly()).hasSize(1);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.1");
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1).getBatch()).isEqualTo(2);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1).getExecuteObjectsCompatibly()).hasSize(1);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1).getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1).getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.2");
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getBatch()).isEqualTo(3);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getExecuteObjectsCompatibly()).hasSize(2);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.3");
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getExecuteObjectsCompatibly().get(1).getHost().getBkCloudId()).isEqualTo(0L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2).getExecuteObjectsCompatibly().get(1).getHost().getIp()).isEqualTo("127.0.0.4");
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getBatch()).isEqualTo(1);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly()).hasSize(1);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.1");
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1)
+            .getBatch()).isEqualTo(2);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1)
+            .getExecuteObjectsCompatibly()).hasSize(1);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1)
+            .getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(1)
+            .getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.2");
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getBatch()).isEqualTo(3);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getExecuteObjectsCompatibly()).hasSize(2);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.3");
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getExecuteObjectsCompatibly().get(1).getHost().getBkCloudId()).isEqualTo(0L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(2)
+            .getExecuteObjectsCompatibly().get(1).getHost().getIp()).isEqualTo("127.0.0.4");
     }
 
     @Test
@@ -139,7 +154,8 @@ void saveRollingConfig() {
         assertThat(savedTaskInstanceRollingConfig.getTaskInstanceId()).isEqualTo(10L);
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail()).isNotNull();
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExpr()).isEqualTo("10%");
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getMode()).isEqualTo(RollingModeEnum.PAUSE_IF_FAIL.getValue());
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getMode())
+            .isEqualTo(RollingModeEnum.PAUSE_IF_FAIL.getValue());
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getName()).isEqualTo("default");
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getStepRollingConfigs()).hasSize(4);
         Map<Long, StepRollingConfigDO> savedStepRollingConfigs =
@@ -149,10 +165,14 @@ void saveRollingConfig() {
         assertThat(savedStepRollingConfigs.get(1002L).isBatch()).isEqualTo(true);
         assertThat(savedStepRollingConfigs.get(1003L).isBatch()).isEqualTo(true);
         assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly()).hasSize(1);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getBatch()).isEqualTo(1);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly().get(0).getHost().getHostId()).isEqualTo(1L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
-        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0).getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.1");
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getBatch()).isEqualTo(1);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly().get(0).getHost().getHostId()).isEqualTo(1L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly().get(0).getHost().getBkCloudId()).isEqualTo(0L);
+        assertThat(savedTaskInstanceRollingConfig.getConfigDetail().getExecuteObjectsBatchListCompatibly().get(0)
+            .getExecuteObjectsCompatibly().get(0).getHost().getIp()).isEqualTo("127.0.0.1");
     }
 }
 
diff --git a/.../src/main/java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbExecuteTaskResourceImpl.java b/.../src/main/java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbExecuteTaskResourceImpl.java
@@ -100,8 +100,8 @@ public EsbResp<EsbJobExecuteDTO> executeJob(
                 taskVariableDTO.setName(globalVar.getName());
                 if ((globalVar.getIpList() != null || globalVar.getDynamicGroupIdList() != null
                     || globalVar.getTargetServer() != null) && StringUtils.isEmpty(globalVar.getValue())) {
-                    ExecuteObjectsDTO executeObjectsDTO = convertToServersDTO(globalVar.getTargetServer(), globalVar.getIpList(),
-                        globalVar.getDynamicGroupIdList());
+                    ExecuteObjectsDTO executeObjectsDTO = convertToServersDTO(
+                        globalVar.getTargetServer(), globalVar.getIpList(), globalVar.getDynamicGroupIdList());
                     taskVariableDTO.setTargetServers(executeObjectsDTO);
                 } else {
                     taskVariableDTO.setValue(globalVar.getValue());

diff --git a/.../java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbGetJobInstanceStatusResourceImpl.java b/.../java/com/tencent/bk/job/execute/api/esb/v2/impl/EsbGetJobInstanceStatusResourceImpl.java
@@ -99,7 +99,8 @@ public EsbResp<EsbJobInstanceStatusDTO> getJobInstanceStatusUsingPost(
         TaskInstanceDTO taskInstance = taskInstanceService.getTaskInstance(username,
             request.getAppResourceScope().getAppId(), request.getTaskInstanceId());
 
-        List<StepInstanceBaseDTO> stepInstances = stepInstanceService.listBaseStepInstanceByTaskInstanceId(taskInstanceId);
+        List<StepInstanceBaseDTO> stepInstances =
+            stepInstanceService.listBaseStepInstanceByTaskInstanceId(taskInstanceId);
         if (stepInstances == null || stepInstances.isEmpty()) {
             log.warn("Get job instance status by taskInstanceId:{}, stepInstanceList is empty!", taskInstanceId);
             throw new NotFoundException(ErrorCode.STEP_INSTANCE_NOT_EXIST);

diff --git a/...ain/java/com/tencent/bk/job/execute/api/esb/v3/EsbGetJobInstanceStatusV3ResourceImpl.java b/...ain/java/com/tencent/bk/job/execute/api/esb/v3/EsbGetJobInstanceStatusV3ResourceImpl.java
@@ -96,7 +96,8 @@ public EsbResp<EsbJobInstanceStatusV3DTO> getJobInstanceStatusUsingPost(
         TaskInstanceDTO taskInstance = taskInstanceService.getTaskInstance(
             username, request.getAppResourceScope().getAppId(), request.getTaskInstanceId());
 
-        List<StepInstanceBaseDTO> stepInstances = stepInstanceService.listBaseStepInstanceByTaskInstanceId(taskInstanceId);
+        List<StepInstanceBaseDTO> stepInstances =
+            stepInstanceService.listBaseStepInstanceByTaskInstanceId(taskInstanceId);
         if (stepInstances == null || stepInstances.isEmpty()) {
             log.warn("Get job instance status by taskInstanceId:{}, stepInstanceList is empty!", taskInstanceId);
             throw new NotFoundException(ErrorCode.STEP_INSTANCE_NOT_EXIST);

diff --git a/...cute/src/main/java/com/tencent/bk/job/execute/engine/result/AbstractResultHandleTask.java b/...cute/src/main/java/com/tencent/bk/job/execute/engine/result/AbstractResultHandleTask.java
@@ -439,7 +439,9 @@ private boolean shouldSkipStep() {
 
     private void saveStatusWhenSkip() {
         List<ExecuteObjectTask> notFinishedExecuteObjectTasks =
-            targetExecuteObjectTasks.values().stream().filter(not(ExecuteObjectTask::isFinished)).collect(Collectors.toList());
+            targetExecuteObjectTasks.values().stream()
+                .filter(not(ExecuteObjectTask::isFinished))
+                .collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(notFinishedExecuteObjectTasks)) {
             notFinishedExecuteObjectTasks.forEach(executeObjectTask -> {
                 executeObjectTask.setStatus(ExecuteObjectTaskStatusEnum.UNKNOWN);

diff --git a/...-job-execute/src/main/java/com/tencent/bk/job/execute/engine/rolling/RollingExprPart.java b/...-job-execute/src/main/java/com/tencent/bk/job/execute/engine/rolling/RollingExprPart.java
@@ -58,6 +58,7 @@ public abstract class RollingExprPart {
      * @param context 解析上下文
      * @return 当前批次的执行对象
      */
-    public abstract List<ExecuteObject> compute(RollingExecuteObjectBatchContext context) throws RollingExprParseException;
+    public abstract List<ExecuteObject> compute(RollingExecuteObjectBatchContext context)
+        throws RollingExprParseException;
 
 }
diff --git a/...service-job-execute/src/main/java/com/tencent/bk/job/execute/model/ExecuteObjectsDTO.java b/...service-job-execute/src/main/java/com/tencent/bk/job/execute/model/ExecuteObjectsDTO.java
@@ -303,7 +303,8 @@ public ExecuteObject findExecuteObjectByCompositeKey(ExecuteObjectCompositeKey e
         switch (compositeKeyType) {
             case EXECUTE_OBJECT_ID:
                 return getExecuteObjectsCompatibly().stream()
-                    .filter(executeObject -> executeObjectCompositeKey.getExecuteObjectId().equals(executeObject.getId()))
+                    .filter(executeObject ->
+                        executeObjectCompositeKey.getExecuteObjectId().equals(executeObject.getId()))
                     .findFirst()
                     .orElse(null);
             case RESOURCE_ID:

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
@@ -1751,8 +1751,12 @@ username, new AppResourceScope(appId), plan.getTaskTemplateId(),
         }
     }
 
-    private Pair<ExecuteObjectsDTO, Set<Long>> extractNeedAuthHostsAndAccounts(StepInstanceDTO stepInstance,
-                                                                               Map<Long, List<String>> whiteHostAllowActions) {
+    private Pair<ExecuteObjectsDTO, Set<Long>> extractNeedAuthHostsAndAccounts
+        (
+            StepInstanceDTO stepInstance,
+            Map<Long, List<String>> whiteHostAllowActions
+        ) {
+
         ExecuteObjectsDTO authServers = new ExecuteObjectsDTO();
         Set<Long> accountIds = new HashSet<>();
         accountIds.add(stepInstance.getAccountId());

diff --git a/...r/src/test/java/com/tencent/bk/job/logsvr/service/impl/LogServiceImplIntegrationTest.java b/...r/src/test/java/com/tencent/bk/job/logsvr/service/impl/LogServiceImplIntegrationTest.java
@@ -402,8 +402,13 @@ void testSaveFileLog() {
     }
 
 
-    private TaskExecuteObjectLog buildFileTaskHostLog(long stepInstanceId, int executeCount, String jobCreateDate, Long hostId,
-                                                      String ip, String ipv6, List<FileTaskLogDoc> fileTaskLogs) {
+    private TaskExecuteObjectLog buildFileTaskHostLog(long stepInstanceId,
+                                                      int executeCount,
+                                                      String jobCreateDate,
+                                                      Long hostId,
+                                                      String ip,
+                                                      String ipv6,
+                                                      List<FileTaskLogDoc> fileTaskLogs) {
         TaskExecuteObjectLog taskExecuteObjectLog = new TaskExecuteObjectLog();
         taskExecuteObjectLog.setStepInstanceId(stepInstanceId);
         taskExecuteObjectLog.setExecuteCount(executeCount);