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

wangyu096 · Feb 1, 2024 · 6ab5dca · 6ab5dca
1 parent 2495e5a
commit 6ab5dca
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/...ice-job-execute/src/main/java/com/tencent/bk/job/execute/engine/util/JobSrcFileUtils.java b/...ice-job-execute/src/main/java/com/tencent/bk/job/execute/engine/util/JobSrcFileUtils.java
@@ -63,17 +63,26 @@ public static Map<JobFile, FileDest> buildSourceDestPathMapping(Set<JobFile> src
         String standardTargetDir = FilePathUtils.standardizedDirPath(targetDir);
         long currentTime = System.currentTimeMillis();
         for (JobFile srcFile : srcFiles) {
-            // 本地文件的源ip是本机ip，展开源文件IP地址宏采用"0.0.0.0"
-            String destDirPath = MacroUtil.resolveFileSrcIpMacro(standardTargetDir,
-                srcFile.getFileType() == TaskFileTypeEnum.LOCAL ? "0_0.0.0.0" :
-                    srcFile.getExecuteObject().getHost().getBkCloudId() + "_"
-                        + srcFile.getExecuteObject().getHost().getPrimaryIp());
+            String destDirPath = resolveFileSrcIp(standardTargetDir, srcFile);
             destDirPath = MacroUtil.resolveDate(destDirPath, currentTime);
             addSourceDestPathMapping(sourceDestPathMap, srcFile, destDirPath, targetFileName);
         }
         return sourceDestPathMap;
     }
 
+
+    private static String resolveFileSrcIp(String targetFilePath, JobFile srcFile) {
+        // 本地文件的源ip是本机ip，展开源文件IP地址宏采用"0.0.0.0"
+        String resolvedTargetPath = targetFilePath;
+        if (srcFile.getExecuteObject().isHostExecuteObject()) {
+            resolvedTargetPath = MacroUtil.resolveFileSrcIpMacro(targetFilePath,
+                srcFile.getFileType() == TaskFileTypeEnum.LOCAL ? "0_0.0.0.0" :
+                    srcFile.getExecuteObject().getHost().getBkCloudId() + "_"
+                        + srcFile.getExecuteObject().getHost().getPrimaryIp());
+        }
+        return resolvedTargetPath;
+    }
+
     private static void addSourceDestPathMapping(Map<JobFile, FileDest> sourceDestPathMap,
                                                  JobFile sourceFile,
                                                  String destDirPath,