test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-02 04:08:31 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix error (#11206)

Browse Source
This commit is contained in:
xuhhui 2022-07-30 18:20:20 +08:00 committed by GitHub
parent d73ad2e7d5
commit bfff3a7c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java
View File

@ -218,7 +218,8 @@ public class TaskExecutionContext implements Serializable {
private ExecutionStatus currentExecutionStatus; 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; private String taskLogName;

6
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
View File

@ -298,10 +298,10 @@ public class TaskExecuteThread implements Runnable, Delayed {
// query the tenant code of the resource according to the name of the resource // query the tenant code of the resource according to the name of the resource
String fullName = fileDownload.getLeft(); String fullName = fileDownload.getLeft();
String tenantCode = fileDownload.getRight(); String tenantCode = fileDownload.getRight();
String resHdfsPath = storageOperate.getResourceFileName(tenantCode, fullName); String resPath = storageOperate.getResourceFileName(tenantCode, fullName);
logger.info("get resource file from hdfs :{}", resHdfsPath); logger.info("get resource file from path:{}", resPath);
long resourceDownloadStartTime = System.currentTimeMillis(); 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.recordWorkerResourceDownloadTime(System.currentTimeMillis() - resourceDownloadStartTime);
WorkerServerMetrics.recordWorkerResourceDownloadSize( WorkerServerMetrics.recordWorkerResourceDownloadSize(
Files.size(Paths.get(execLocalPath, fullName))); Files.size(Paths.get(execLocalPath, fullName)));