From bfff3a7c5d58429dd14cb81f91931687b236a069 Mon Sep 17 00:00:00 2001 From: xuhhui Date: Sat, 30 Jul 2022 18:20:20 +0800 Subject: [PATCH] fix error (#11206) --- .../plugin/task/api/TaskExecutionContext.java | 3 ++- .../server/worker/runner/TaskExecuteThread.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java index c1276d580..aa95cedca 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java @@ -218,7 +218,8 @@ public class TaskExecutionContext implements Serializable { private ExecutionStatus currentExecutionStatus; /** - * Task Logger name should be like: Task-{processDefinitionId}-{processInstanceId}-{taskInstanceId} + * Task Logger name should be like: + * TaskAppId=TASK-{firstSubmitTime}-{processDefineCode}_{processDefineVersion}-{processInstanceId}-{taskInstanceId} */ private String taskLogName; diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java index ce9eee6a2..b14172a6a 100644 --- a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java +++ b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java @@ -298,10 +298,10 @@ public class TaskExecuteThread implements Runnable, Delayed { // query the tenant code of the resource according to the name of the resource String fullName = fileDownload.getLeft(); String tenantCode = fileDownload.getRight(); - String resHdfsPath = storageOperate.getResourceFileName(tenantCode, fullName); - logger.info("get resource file from hdfs :{}", resHdfsPath); + String resPath = storageOperate.getResourceFileName(tenantCode, fullName); + logger.info("get resource file from path:{}", resPath); long resourceDownloadStartTime = System.currentTimeMillis(); - storageOperate.download(tenantCode, resHdfsPath, execLocalPath + File.separator + fullName, false, true); + storageOperate.download(tenantCode, resPath, execLocalPath + File.separator + fullName, false, true); WorkerServerMetrics.recordWorkerResourceDownloadTime(System.currentTimeMillis() - resourceDownloadStartTime); WorkerServerMetrics.recordWorkerResourceDownloadSize( Files.size(Paths.get(execLocalPath, fullName))); -- GitLab