Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-14772. RBF: hdfs-rbf-site.xml can't be loaded automatically. Contributed by Yuxuan Wang

This commit is contained in:
Takanobu Asanuma 2019-08-27 14:32:32 +09:00
parent 4379370fb1
commit b69ac575a1
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java
View File

@ -37,6 +37,7 @@ public class HdfsConfiguration extends Configuration {
Configuration.addDefaultResource("hdfs-default.xml"); Configuration.addDefaultResource("hdfs-default.xml");
Configuration.addDefaultResource("hdfs-rbf-default.xml"); Configuration.addDefaultResource("hdfs-rbf-default.xml");
Configuration.addDefaultResource("hdfs-site.xml"); Configuration.addDefaultResource("hdfs-site.xml");
Configuration.addDefaultResource("hdfs-rbf-site.xml");
} }
public HdfsConfiguration() { public HdfsConfiguration() {

7
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RBFConfigKeys.java
View File

@ -19,7 +19,6 @@
package org.apache.hadoop.hdfs.server.federation.router; package org.apache.hadoop.hdfs.server.federation.router;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.hdfs.server.federation.metrics.FederationRPCPerformanceMonitor; import org.apache.hadoop.hdfs.server.federation.metrics.FederationRPCPerformanceMonitor;
import org.apache.hadoop.hdfs.server.federation.resolver.ActiveNamenodeResolver; import org.apache.hadoop.hdfs.server.federation.resolver.ActiveNamenodeResolver;
@ -40,12 +39,6 @@ import java.util.concurrent.TimeUnit;
@InterfaceAudience.Private @InterfaceAudience.Private
public class RBFConfigKeys extends CommonConfigurationKeysPublic { 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 // HDFS Router-based federation
public static final String FEDERATION_ROUTER_PREFIX = public static final String FEDERATION_ROUTER_PREFIX =
"dfs.federation.router."; "dfs.federation.router.";