Browse Source

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

pull/3/MERGE
lgcareer 4 years ago
parent
commit
268d09de1a
  1. 26
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

26
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java

@ -195,7 +195,7 @@ public class HadoopUtils implements Closeable {
*/ */
String appUrl = ""; String appUrl = "";
if (StringUtils.isEmpty(rmHaIds)){ if (StringUtils.isEmpty(rmHaIds)) {
//single resourcemanager enabled //single resourcemanager enabled
appUrl = appAddress; appUrl = appAddress;
yarnEnabled = true; yarnEnabled = true;
@ -206,7 +206,7 @@ public class HadoopUtils implements Closeable {
logger.info("application url : {}", appUrl); logger.info("application url : {}", appUrl);
} }
if(StringUtils.isBlank(appUrl)){ if (StringUtils.isBlank(appUrl)) {
throw new Exception("application url is blank"); throw new Exception("application url is blank");
} }
return String.format(appUrl, applicationId); return String.format(appUrl, applicationId);
@ -226,11 +226,11 @@ public class HadoopUtils implements Closeable {
return new byte[0]; return new byte[0];
} }
FSDataInputStream fsDataInputStream = fs.open(new Path(hdfsFilePath)); try (FSDataInputStream fsDataInputStream = fs.open(new Path(hdfsFilePath))) {
return IOUtils.toByteArray(fsDataInputStream); return IOUtils.toByteArray(fsDataInputStream);
}
} }
/** /**
* cat file on hdfs * cat file on hdfs
* *
@ -493,20 +493,19 @@ public class HadoopUtils implements Closeable {
return String.format("%s/udfs", getHdfsTenantDir(tenantCode)); return String.format("%s/udfs", getHdfsTenantDir(tenantCode));
} }
/** /**
* get hdfs file name * get hdfs file name
* *
* @param resourceType resource type * @param resourceType resource type
* @param tenantCode tenant code * @param tenantCode tenant code
* @param fileName file name * @param fileName file name
* @return hdfs file name * @return hdfs file name
*/ */
public static String getHdfsFileName(ResourceType resourceType, String tenantCode, String fileName) { public static String getHdfsFileName(ResourceType resourceType, String tenantCode, String fileName) {
if (fileName.startsWith("/")) { 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);
} }
/** /**
@ -518,7 +517,7 @@ public class HadoopUtils implements Closeable {
*/ */
public static String getHdfsResourceFileName(String tenantCode, String fileName) { public static String getHdfsResourceFileName(String tenantCode, String fileName) {
if (fileName.startsWith("/")) { if (fileName.startsWith("/")) {
fileName = fileName.replaceFirst("/",""); fileName = fileName.replaceFirst("/", "");
} }
return String.format("%s/%s", getHdfsResDir(tenantCode), fileName); return String.format("%s/%s", getHdfsResDir(tenantCode), fileName);
} }
@ -532,7 +531,7 @@ public class HadoopUtils implements Closeable {
*/ */
public static String getHdfsUdfFileName(String tenantCode, String fileName) { public static String getHdfsUdfFileName(String tenantCode, String fileName) {
if (fileName.startsWith("/")) { if (fileName.startsWith("/")) {
fileName = fileName.replaceFirst("/",""); fileName = fileName.replaceFirst("/", "");
} }
return String.format("%s/%s", getHdfsUdfDir(tenantCode), fileName); return String.format("%s/%s", getHdfsUdfDir(tenantCode), fileName);
} }
@ -545,7 +544,6 @@ public class HadoopUtils implements Closeable {
return String.format("%s/%s", getHdfsDataBasePath(), tenantCode); return String.format("%s/%s", getHdfsDataBasePath(), tenantCode);
} }
/** /**
* getAppAddress * getAppAddress
* *

Loading…
Cancel
Save