This is an automated email from the ASF dual-hosted git repository. zhongjiajie pushed a commit to branch 3.0.0-prepare in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit d550f9917ebbb0cf828abdd72104f626027ee9b5 Author: xuhhui <[email protected]> AuthorDate: Sat Jul 30 18:20:20 2022 +0800 fix error (#11206) (cherry picked from commit bfff3a7c5d58429dd14cb81f91931687b236a069) --- .../dolphinscheduler/plugin/task/api/TaskExecutionContext.java | 3 ++- .../dolphinscheduler/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 0ae6f31c35..1e627733bb 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 @@ -213,7 +213,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 86bd34061b..7c7e05a333 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 @@ -317,9 +317,9 @@ 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); - storageOperate.download(tenantCode, resHdfsPath, execLocalPath + File.separator + fullName, false, true); + String resPath = storageOperate.getResourceFileName(tenantCode, fullName); + logger.info("get resource file from path:{}", resPath); + storageOperate.download(tenantCode, resPath, execLocalPath + File.separator + fullName, false, true); } catch (Exception e) { logger.error(e.getMessage(), e); throw new ServiceException(e.getMessage());
