natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bug-14105][Task] Replace default tenant when downloading resource (#14106)

This commit is contained in:
Aaron Wang 2023-05-16 18:11:58 +08:00 committed by GitHub
parent f384d71da0
commit 74ed7856bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/src/main/java/org/apache/dolphinscheduler/plugin/storage/hdfs/HdfsStorageOperator.java
View File

@ -312,7 +312,7 @@ public class HdfsStorageOperator implements Closeable, StorageOperate {
}
@Override
public void download(String bucketName, String srcHdfsFilePath, String dstFile, boolean deleteSource,
public void download(String tenantCode, String srcHdfsFilePath, String dstFile, boolean deleteSource,
boolean overwrite) throws IOException {
copyHdfsToLocal(srcHdfsFilePath, dstFile, deleteSource, overwrite);
}

7
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/utils/TaskExecutionCheckerUtils.java
View File

@ -110,13 +110,16 @@ public class TaskExecutionCheckerUtils {
TaskExecutionContext taskExecutionContext) {
String execLocalPath = taskExecutionContext.getExecutePath();
String tenant = taskExecutionContext.getTenantCode();
String actualTenant =
TenantConstants.DEFAULT_TENANT_CODE.equals(tenant) ? TenantConstants.BOOTSTRAPT_SYSTEM_USER : tenant;
Map<String, String> projectRes = taskExecutionContext.getResources();
if (MapUtils.isEmpty(projectRes)) {
return;
}
List<Pair<String, String>> downloadFiles = new ArrayList<>();
projectRes.keySet().forEach(fullName -> {
String fileName = storageOperate.getResourceFileName(tenant, fullName);
String fileName = storageOperate.getResourceFileName(actualTenant, fullName);
projectRes.put(fullName, fileName);
File resFile = new File(execLocalPath, fileName);
boolean notExist = !resFile.exists();
@ -138,7 +141,7 @@ public class TaskExecutionCheckerUtils {
log.info("get resource file from path:{}", fullName);
long resourceDownloadStartTime = System.currentTimeMillis();
storageOperate.download(taskExecutionContext.getTenantCode(), fullName,
storageOperate.download(actualTenant, fullName,
execLocalPath + File.separator + fileName, false,
true);
WorkerServerMetrics