feat: 定时任务兼容不合法主机 TencentBlueKing#3305

wangyu096 · Nov 29, 2024 · fe09543 · fe09543
1 parent e5af8c5
commit fe09543
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
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
@@ -204,9 +204,9 @@ public abstract class AbstractResultHandleTask<T> implements ContinuousScheduled
      */
     protected boolean gseV2Task;
     /**
-     * 是否包含不可执行的执行对象
+     * 是否包含不可执行的目标执行对象
      */
-    protected boolean hasNoExecutableExecuteObject;
+    protected boolean hasNoExecutableTargetExecuteObject;
     /**
      * GSE 任务信息，用于日志输出
      */
@@ -265,9 +265,11 @@ protected AbstractResultHandleTask(EngineDependentServiceHolder engineDependentS
             }
         }
 
-        this.hasNoExecutableExecuteObject =
-            executeObjectTasks.stream().anyMatch(
-                executeObjectTask -> !executeObjectTask.getExecuteObject().isExecutable());
+        this.hasNoExecutableTargetExecuteObject =
+            executeObjectTasks.stream().
+                filter(ExecuteObjectTask::isTarget)
+                .anyMatch(executeObjectTask -> !executeObjectTask.getExecuteObject().isExecutable());
+        log.info("hasNoExecutableTargetExecuteObject: {}", hasNoExecutableTargetExecuteObject);
     }
 
     private String buildGseTaskInfo(Long jobInstanceId, GseTaskDTO gseTask) {
@@ -706,7 +708,7 @@ protected GseTaskExecuteResult analyseFinishedExecuteResult() {
      * 任务是否包含不可执行的执行对象
      */
     protected boolean containsNoExecutableExecuteObject() {
-        return this.hasNoExecutableExecuteObject;
+        return this.hasNoExecutableTargetExecuteObject;
     }
 
     /**

diff --git a/...-execute/src/main/java/com/tencent/bk/job/execute/engine/result/FileResultHandleTask.java b/...-execute/src/main/java/com/tencent/bk/job/execute/engine/result/FileResultHandleTask.java
@@ -188,9 +188,10 @@ public FileResultHandleTask(EngineDependentServiceHolder engineDependentServiceH
                     !executeObjectTask.getExecuteObject().isExecutable());
 
         log.info("InitFileResultHandleTask|stepInstanceId: {}|sourceExecuteObjectGseKeys: {}"
-                + "|targetExecuteObjectGseKeys: {}|fileUploadTaskNumMap: {}|fileDownloadTaskNumMap: {}",
+                + "|targetExecuteObjectGseKeys: {}|fileUploadTaskNumMap: {}|fileDownloadTaskNumMap: {}"
+                + "|hasNoExecutableSourceExecuteObject: {}",
             stepInstance.getId(), sourceExecuteObjectGseKeys, targetExecuteObjectGseKeys, fileUploadTaskNumMap,
-            fileDownloadTaskNumMap);
+            fileDownloadTaskNumMap, hasNoExecutableSourceExecuteObject);
     }
 
     private void initSrcFilesMap(Collection<JobFile> srcFiles) {
@@ -539,7 +540,7 @@ private GseTaskExecuteResult analyseExecuteResult() {
 
     @Override
     protected boolean containsNoExecutableExecuteObject() {
-        return this.hasNoExecutableExecuteObject || this.hasNoExecutableSourceExecuteObject;
+        return this.hasNoExecutableTargetExecuteObject || this.hasNoExecutableSourceExecuteObject;
     }
 
     private boolean isAllSourceExecuteObjectTasksDone() {