Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-#3713][common]Fix that catfile method Stream not closed #3810

Merged
merged 2 commits into from
Sep 24, 2020
Merged

[Fix-#3713][common]Fix that catfile method Stream not closed #3810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75bc3a6
[Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
BoYiZhang Sep 12, 2020
268d09d
[Fix-#3713][common]Fix that catfile method Stream not closed
lgcareer Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions ...nscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public String getApplicationUrl(String applicationId) throws Exception {
*/
String appUrl = "";

if (StringUtils.isEmpty(rmHaIds)){
if (StringUtils.isEmpty(rmHaIds)) {
//single resourcemanager enabled
appUrl = appAddress;
yarnEnabled = true;
Expand All @@ -206,7 +206,7 @@ public String getApplicationUrl(String applicationId) throws Exception {
logger.info("application url : {}", appUrl);
}

if(StringUtils.isBlank(appUrl)){
if (StringUtils.isBlank(appUrl)) {
throw new Exception("application url is blank");
}
return String.format(appUrl, applicationId);
Expand All @@ -226,11 +226,11 @@ public byte[] catFile(String hdfsFilePath) throws IOException {
return new byte[0];
}

FSDataInputStream fsDataInputStream = fs.open(new Path(hdfsFilePath));
return IOUtils.toByteArray(fsDataInputStream);
try (FSDataInputStream fsDataInputStream = fs.open(new Path(hdfsFilePath))) {
return IOUtils.toByteArray(fsDataInputStream);
}
}


/**
* cat file on hdfs
*
Expand Down Expand Up @@ -493,20 +493,19 @@ public static String getHdfsUdfDir(String tenantCode) {
return String.format("%s/udfs", getHdfsTenantDir(tenantCode));
}


/**
* get hdfs file name
*
* @param resourceType resource type
* @param tenantCode tenant code
* @param fileName file name
* @param resourceType resource type
* @param tenantCode tenant code
* @param fileName file name
* @return hdfs file name
*/
public static String getHdfsFileName(ResourceType resourceType, String tenantCode, String fileName) {
if (fileName.startsWith("/")) {
fileName = fileName.replaceFirst("/","");
fileName = fileName.replaceFirst("/", "");
}
return String.format("%s/%s", getHdfsDir(resourceType,tenantCode), fileName);
return String.format("%s/%s", getHdfsDir(resourceType, tenantCode), fileName);
}

/**
Expand All @@ -518,7 +517,7 @@ public static String getHdfsFileName(ResourceType resourceType, String tenantCod
*/
public static String getHdfsResourceFileName(String tenantCode, String fileName) {
if (fileName.startsWith("/")) {
fileName = fileName.replaceFirst("/","");
fileName = fileName.replaceFirst("/", "");
}
return String.format("%s/%s", getHdfsResDir(tenantCode), fileName);
}
Expand All @@ -532,7 +531,7 @@ public static String getHdfsResourceFileName(String tenantCode, String fileName)
*/
public static String getHdfsUdfFileName(String tenantCode, String fileName) {
if (fileName.startsWith("/")) {
fileName = fileName.replaceFirst("/","");
fileName = fileName.replaceFirst("/", "");
}
return String.format("%s/%s", getHdfsUdfDir(tenantCode), fileName);
}
Expand All @@ -545,7 +544,6 @@ public static String getHdfsTenantDir(String tenantCode) {
return String.format("%s/%s", getHdfsDataBasePath(), tenantCode);
}


/**
* getAppAddress
*
Expand Down