diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java index bcb6d5ca9a..d780896685 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java @@ -68,6 +68,11 @@ public final class Constants { */ public static final String FS_DEFAULT_FS = "resource.hdfs.fs.defaultFS"; + /** + * hdfs defaultFS property name. Should be consistent with the property name in hdfs-site.xml + */ + public static final String HDFS_DEFAULT_FS = "fs.defaultFS"; + /** * hadoop configuration */ diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java index 8d7e4c2a6b..9f35607fb3 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java @@ -70,7 +70,7 @@ import com.google.common.cache.LoadingCache; public class HadoopUtils implements Closeable, StorageOperate { private static final Logger logger = LoggerFactory.getLogger(HadoopUtils.class); - private String hdfsUser = PropertyUtils.getString(Constants.HDFS_ROOT_USER); + private String hdfsUser; public static final String RM_HA_IDS = PropertyUtils.getString(Constants.YARN_RESOURCEMANAGER_HA_RM_IDS); public static final String APP_ADDRESS = PropertyUtils.getString(Constants.YARN_APPLICATION_STATUS_ADDRESS); public static final String JOB_HISTORY_ADDRESS = PropertyUtils.getString(Constants.YARN_JOB_HISTORY_STATUS_ADDRESS); @@ -140,7 +140,7 @@ public class HadoopUtils implements Closeable, StorageOperate { // the default is the local file system if (StringUtils.isNotBlank(defaultFS)) { Map fsRelatedProps = PropertyUtils.getPrefixedProperties("fs."); - configuration.set(Constants.FS_DEFAULT_FS, defaultFS); + configuration.set(Constants.HDFS_DEFAULT_FS, defaultFS); fsRelatedProps.forEach((key, value) -> configuration.set(key, value)); } else { logger.error("property:{} can not to be empty, please set!", Constants.FS_DEFAULT_FS);