perf: 提供步骤详情与步骤执行结果查询的APIGW接口 TencentBlueKing#2596

步骤执行结果查询接口支持获取所有分组数据
jsonwan · Nov 27, 2023 · 66c4143 · 66c4143
1 parent 1ccbcbb
commit 66c4143
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...in/java/com/tencent/bk/job/execute/api/esb/v3/EsbGetStepInstanceStatusV3ResourceImpl.java b/...in/java/com/tencent/bk/job/execute/api/esb/v3/EsbGetStepInstanceStatusV3ResourceImpl.java
@@ -143,6 +143,7 @@ public EsbResp<EsbStepInstanceStatusV3DTO> getStepInstanceStatus(String username
             .logKeyword(keyword)
             .searchIp(searchIp)
             .maxAgentTasksForResultGroup(maxHostNumPerGroup)
+            .fetchAllGroupData(status == null)
             .build();
 
         StepExecutionDetailDTO executionResult = taskResultService.getStepExecutionResult(username, appId, query);

diff --git a/...-job-execute/src/main/java/com/tencent/bk/job/execute/model/StepExecutionResultQuery.java b/...-job-execute/src/main/java/com/tencent/bk/job/execute/model/StepExecutionResultQuery.java
@@ -89,6 +89,10 @@ public class StepExecutionResultQuery {
      * 执行结果分组下返回的最大任务数
      */
     private Integer maxAgentTasksForResultGroup;
+    /**
+     * 是否获取所有分组下的所有主机执行数据（默认为false，只获取第一个分组中的数据）
+     */
+    private boolean fetchAllGroupData;
     /**
      * 排序字段
      */

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
@@ -322,10 +322,11 @@ private void setAgentTasksForAnyResultType(List<AgentTaskResultGroupDTO> resultG
                                                StepInstanceBaseDTO stepInstance,
                                                int executeCount,
                                                Integer batch,
-                                               Integer maxAgentTasksForResultGroup) {
+                                               Integer maxAgentTasksForResultGroup,
+                                               boolean fetchAllGroupData) {
         boolean isAgentTaskSet = false;
         for (AgentTaskResultGroupDTO resultGroup : resultGroups) {
-            if (!isAgentTaskSet) {
+            if (!isAgentTaskSet || fetchAllGroupData) {
                 isAgentTaskSet = fillAgentTasksForResultGroup(resultGroup, stepInstance, executeCount,
                     batch, resultGroup.getStatus(), resultGroup.getTag(), maxAgentTasksForResultGroup);
             } else {
@@ -533,7 +534,9 @@ private StepExecutionDetailDTO loadAllTasksFromDBAndBuildExecutionResultInMemory
                 filterAgentTasksByMatchIp(resultGroups, query.getMatchHostIds());
             }
 
-            removeAgentTasksForNotSpecifiedResultGroup(resultGroups, query.getStatus(), query.getTag());
+            if (!query.isFetchAllGroupData()) {
+                removeAgentTasksForNotSpecifiedResultGroup(resultGroups, query.getStatus(), query.getTag());
+            }
             watch.stop();
 
 
@@ -725,11 +728,11 @@ private StepExecutionDetailDTO filterAndSortExecutionResultInDB(StopWatch watch,
                 setAgentTasksForSpecifiedResultType(resultGroups, status, tag, tasks);
             } else {
                 setAgentTasksForAnyResultType(resultGroups, stepInstance, queryExecuteCount,
-                    query.getBatch(), query.getMaxAgentTasksForResultGroup());
+                    query.getBatch(), query.getMaxAgentTasksForResultGroup(), query.isFetchAllGroupData());
             }
         } else {
             setAgentTasksForAnyResultType(resultGroups, stepInstance, queryExecuteCount,
-                query.getBatch(), query.getMaxAgentTasksForResultGroup());
+                query.getBatch(), query.getMaxAgentTasksForResultGroup(), query.isFetchAllGroupData());
         }
         watch.stop();