From b69ac575a1a02d39c64c6cf998ec2ef4eb5918cd Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Tue, 27 Aug 2019 14:32:32 +0900 Subject: [PATCH] HDFS-14772. RBF: hdfs-rbf-site.xml can't be loaded automatically. Contributed by Yuxuan Wang --- .../java/org/apache/hadoop/hdfs/HdfsConfiguration.java | 1 + .../hdfs/server/federation/router/RBFConfigKeys.java | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java index ec615ca743..65efaf9dfa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java @@ -37,6 +37,7 @@ public class HdfsConfiguration extends Configuration { Configuration.addDefaultResource("hdfs-default.xml"); Configuration.addDefaultResource("hdfs-rbf-default.xml"); Configuration.addDefaultResource("hdfs-site.xml"); + Configuration.addDefaultResource("hdfs-rbf-site.xml"); } public HdfsConfiguration() { diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java index a2bec12226..489ff45907 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java @@ -19,7 +19,6 @@ package org.apache.hadoop.hdfs.server.federation.router; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.hdfs.server.federation.metrics.FederationRPCPerformanceMonitor; import org.apache.hadoop.hdfs.server.federation.resolver.ActiveNamenodeResolver; @@ -40,12 +39,6 @@ import java.util.concurrent.TimeUnit; @InterfaceAudience.Private public class RBFConfigKeys extends CommonConfigurationKeysPublic { - public static final String HDFS_RBF_SITE_XML = "hdfs-rbf-site.xml"; - - static { - Configuration.addDefaultResource(HDFS_RBF_SITE_XML); - } - // HDFS Router-based federation public static final String FEDERATION_ROUTER_PREFIX = "dfs.federation.router.";