feature: 原子操作能力支持滚动执行 TencentBlueKing#446

修复执行详情-结果分组和主机数量不正确的问题
wangyu096 · Jul 14, 2022 · f2b5cf9 · f2b5cf9
1 parent b3509a2
commit f2b5cf9
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 5 deletions.
diff --git a/...b-execute/src/main/java/com/tencent/bk/job/execute/model/AgentTaskResultGroupBaseDTO.java b/...b-execute/src/main/java/com/tencent/bk/job/execute/model/AgentTaskResultGroupBaseDTO.java
@@ -56,6 +56,12 @@ public AgentTaskResultGroupBaseDTO(Integer status, String tag) {
         this.tag = tag;
     }
 
+    public AgentTaskResultGroupBaseDTO(AgentTaskResultGroupBaseDTO baseResultGroup) {
+        this.status = baseResultGroup.getStatus();
+        this.tag = baseResultGroup.getTag();
+        this.totalAgentTasks = baseResultGroup.getTotalAgentTasks();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/...e-job-execute/src/main/java/com/tencent/bk/job/execute/model/AgentTaskResultGroupDTO.java b/...e-job-execute/src/main/java/com/tencent/bk/job/execute/model/AgentTaskResultGroupDTO.java
@@ -48,4 +48,7 @@ public AgentTaskResultGroupDTO(Integer status, String tag) {
         super(status, tag);
     }
 
+    public AgentTaskResultGroupDTO(AgentTaskResultGroupBaseDTO baseResultGroup) {
+        super(baseResultGroup);
+    }
 }
diff --git a/...ervice-job-execute/src/main/java/com/tencent/bk/job/execute/service/AgentTaskService.java b/...ervice-job-execute/src/main/java/com/tencent/bk/job/execute/service/AgentTaskService.java
@@ -28,6 +28,7 @@
 import com.tencent.bk.job.common.constant.Order;
 import com.tencent.bk.job.execute.model.AgentTaskDTO;
 import com.tencent.bk.job.execute.model.AgentTaskDetailDTO;
+import com.tencent.bk.job.execute.model.AgentTaskResultGroupBaseDTO;
 import com.tencent.bk.job.execute.model.AgentTaskResultGroupDTO;
 import com.tencent.bk.job.execute.model.StepInstanceBaseDTO;
 
@@ -94,6 +95,18 @@ List<AgentTaskResultGroupDTO> listAndGroupAgentTasks(StepInstanceBaseDTO stepIns
                                                          int executeCount,
                                                          Integer batch);
 
+    /**
+     * 获取任务结果分组
+     *
+     * @param stepInstanceId 步骤实例ID
+     * @param executeCount   执行次数
+     * @param batch          滚动执行批次；传入null或者0将忽略该参数
+     * @return Agent任务
+     */
+    List<AgentTaskResultGroupBaseDTO> listResultGroups(long stepInstanceId,
+                                                       int executeCount,
+                                                       Integer batch);
+
     /**
      * 根据执行结果查询Agent任务详情(排序、限制返回数量) - 包含主机详情
      *

diff --git a/...ecute/src/main/java/com/tencent/bk/job/execute/service/impl/FileAgentTaskServiceImpl.java b/...ecute/src/main/java/com/tencent/bk/job/execute/service/impl/FileAgentTaskServiceImpl.java
@@ -9,6 +9,7 @@
 import com.tencent.bk.job.execute.dao.GseTaskIpLogDAO;
 import com.tencent.bk.job.execute.model.AgentTaskDTO;
 import com.tencent.bk.job.execute.model.AgentTaskDetailDTO;
+import com.tencent.bk.job.execute.model.AgentTaskResultGroupBaseDTO;
 import com.tencent.bk.job.execute.model.AgentTaskResultGroupDTO;
 import com.tencent.bk.job.execute.model.FileSourceDTO;
 import com.tencent.bk.job.execute.model.StepInstanceBaseDTO;
@@ -114,6 +115,19 @@ public List<AgentTaskResultGroupDTO> listAndGroupAgentTasks(StepInstanceBaseDTO
         return resultGroups.stream().sorted().collect(Collectors.toList());
     }
 
+    @Override
+    public List<AgentTaskResultGroupBaseDTO> listResultGroups(long stepInstanceId,
+                                                              int executeCount,
+                                                              Integer batch) {
+        List<AgentTaskResultGroupBaseDTO> resultGroups;
+        resultGroups = fileAgentTaskDAO.listResultGroups(stepInstanceId, executeCount, batch);
+        if (CollectionUtils.isEmpty(resultGroups)) {
+            // 兼容历史数据
+            resultGroups = gseTaskIpLogDAO.listResultGroups(stepInstanceId, executeCount);
+        }
+        return resultGroups;
+    }
+
     @Override
     public List<AgentTaskDetailDTO> listAgentTaskDetailByResultGroup(StepInstanceBaseDTO stepInstance,
                                                                      Integer executeCount,

diff --git a/...ute/src/main/java/com/tencent/bk/job/execute/service/impl/ScriptAgentTaskServiceImpl.java b/...ute/src/main/java/com/tencent/bk/job/execute/service/impl/ScriptAgentTaskServiceImpl.java
@@ -9,6 +9,7 @@
 import com.tencent.bk.job.execute.dao.ScriptAgentTaskDAO;
 import com.tencent.bk.job.execute.model.AgentTaskDTO;
 import com.tencent.bk.job.execute.model.AgentTaskDetailDTO;
+import com.tencent.bk.job.execute.model.AgentTaskResultGroupBaseDTO;
 import com.tencent.bk.job.execute.model.AgentTaskResultGroupDTO;
 import com.tencent.bk.job.execute.model.StepInstanceBaseDTO;
 import com.tencent.bk.job.execute.service.HostService;
@@ -159,6 +160,19 @@ public List<AgentTaskResultGroupDTO> listAndGroupAgentTasks(StepInstanceBaseDTO
         return resultGroups.stream().sorted().collect(Collectors.toList());
     }
 
+    @Override
+    public List<AgentTaskResultGroupBaseDTO> listResultGroups(long stepInstanceId,
+                                                              int executeCount,
+                                                              Integer batch) {
+        List<AgentTaskResultGroupBaseDTO> resultGroups;
+        resultGroups = scriptAgentTaskDAO.listResultGroups(stepInstanceId, executeCount, batch);
+        if (CollectionUtils.isEmpty(resultGroups)) {
+            // 兼容历史数据
+            resultGroups = gseTaskIpLogDAO.listResultGroups(stepInstanceId, executeCount);
+        }
+        return resultGroups;
+    }
+
     @Override
     public List<AgentTaskDetailDTO> listAgentTaskDetailByResultGroup(StepInstanceBaseDTO stepInstance,
                                                                      Integer executeCount,

diff --git a/...-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskResultServiceImpl.java b/...-execute/src/main/java/com/tencent/bk/job/execute/service/impl/TaskResultServiceImpl.java
@@ -48,6 +48,7 @@
 import com.tencent.bk.job.execute.engine.consts.AgentTaskStatus;
 import com.tencent.bk.job.execute.model.AgentTaskDTO;
 import com.tencent.bk.job.execute.model.AgentTaskDetailDTO;
+import com.tencent.bk.job.execute.model.AgentTaskResultGroupBaseDTO;
 import com.tencent.bk.job.execute.model.AgentTaskResultGroupDTO;
 import com.tencent.bk.job.execute.model.ConfirmStepInstanceDTO;
 import com.tencent.bk.job.execute.model.FileSourceTaskLogDTO;
@@ -551,7 +552,7 @@ private StepExecutionDetailDTO loadAllTasksFromDBAndBuildExecutionResultInMemory
 
             watch.start("loadAllTasksFromDbAndGroup");
             List<AgentTaskResultGroupDTO> resultGroups = listAndGroupAgentTasks(stepInstance,
-                query.getStepInstanceId(), query.getExecuteCount(), query.getBatch());
+                query.getExecuteCount(), query.getBatch());
 
             if (CollectionUtils.isNotEmpty(query.getMatchHostIds())) {
                 filterAgentTasksByMatchIp(resultGroups, query.getMatchHostIds());
@@ -579,7 +580,6 @@ private StepExecutionDetailDTO loadAllTasksFromDBAndBuildExecutionResultInMemory
     }
 
     private List<AgentTaskResultGroupDTO> listAndGroupAgentTasks(StepInstanceBaseDTO stepInstance,
-                                                                 long stepInstanceId,
                                                                  int executeCount,
                                                                  Integer batch) {
         List<AgentTaskResultGroupDTO> resultGroups = null;
@@ -671,7 +671,7 @@ private Set<Long> getMatchHostIdsByIp(StepInstanceBaseDTO stepInstance, StepExec
 
     private StepExecutionDetailDTO buildExecutionDetailWhenTaskAreEmpty(StepInstanceBaseDTO stepInstance,
                                                                         Integer batch) {
-        List<AgentTaskResultGroupDTO> resultGroups = listAndGroupAgentTasks(stepInstance, stepInstance.getId(),
+        List<AgentTaskResultGroupDTO> resultGroups = listAndGroupAgentTasks(stepInstance,
             stepInstance.getExecuteCount(), batch);
         StepExecutionDetailDTO executeDetail = new StepExecutionDetailDTO(stepInstance);
         executeDetail.setResultGroups(resultGroups);
@@ -713,7 +713,6 @@ private StepExecutionDetailDTO filterAndSortExecutionResultInDB(StopWatch watch,
                                                                     StepInstanceBaseDTO stepInstance,
                                                                     StepExecutionResultQuery query) {
         query.transformOrderFieldToDbField();
-        long stepInstanceId = query.getStepInstanceId();
         int queryExecuteCount = query.getExecuteCount();
         Integer status = query.getStatus();
         String tag = query.getTag();
@@ -722,11 +721,14 @@ private StepExecutionDetailDTO filterAndSortExecutionResultInDB(StopWatch watch,
         executeDetail.setExecuteCount(queryExecuteCount);
 
         watch.start("getBaseResultGroups");
-        List<AgentTaskResultGroupDTO> resultGroups = listAndGroupAgentTasks(stepInstance, stepInstanceId,
+        List<AgentTaskResultGroupBaseDTO> baseResultGroups = listBaseResultGroups(stepInstance,
             queryExecuteCount, query.getBatch());
         watch.stop();
 
         watch.start("setAgentTasks");
+        List<AgentTaskResultGroupDTO> resultGroups = baseResultGroups.stream()
+            .map(AgentTaskResultGroupDTO::new)
+            .collect(Collectors.toList());
         if (status != null) {
             List<AgentTaskDetailDTO> tasks = listAgentTaskByResultGroup(stepInstance, queryExecuteCount,
                 query.getBatch(), status, tag, query.getMaxAgentTasksForResultGroup(), query.getOrderField(),
@@ -748,6 +750,18 @@ private StepExecutionDetailDTO filterAndSortExecutionResultInDB(StopWatch watch,
         return executeDetail;
     }
 
+    private List<AgentTaskResultGroupBaseDTO> listBaseResultGroups(StepInstanceBaseDTO stepInstance,
+                                                                   int executeCount,
+                                                                   Integer batch) {
+        List<AgentTaskResultGroupBaseDTO> resultGroups = null;
+        if (stepInstance.isScriptStep()) {
+            resultGroups = scriptAgentTaskService.listResultGroups(stepInstance.getId(), executeCount, batch);
+        } else if (stepInstance.isFileStep()) {
+            resultGroups = fileAgentTaskService.listResultGroups(stepInstance.getId(), executeCount, batch);
+        }
+        return resultGroups;
+    }
+
     private List<AgentTaskDetailDTO> listAgentTaskByResultGroup(StepInstanceBaseDTO stepInstance,
                                                                 int queryExecuteCount,
                                                                 Integer batch,