[dolphinscheduler] branch dev updated: fix error (#11206)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new bfff3a7c5d fix error (#11206)
bfff3a7c5d is described below

commit bfff3a7c5d58429dd14cb81f91931687b236a069
Author: xuhhui <xuhai...@cmss.chinamobile.com>
AuthorDate: Sat Jul 30 18:20:20 2022 +0800

    fix error (#11206)
---
 .../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 c1276d5806..aa95cedca0 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 ce9eee6a22..b14172a6a7 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)));