You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2019/08/27 05:33:56 UTC
[hadoop] branch trunk updated: HDFS-14772. RBF: hdfs-rbf-site.xml
can't be loaded automatically. Contributed by Yuxuan Wang
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b69ac57 HDFS-14772. RBF: hdfs-rbf-site.xml can't be loaded automatically. Contributed by Yuxuan Wang
b69ac57 is described below
commit b69ac575a1a02d39c64c6cf998ec2ef4eb5918cd
Author: Takanobu Asanuma <ta...@apache.org>
AuthorDate: Tue Aug 27 14:32:32 2019 +0900
HDFS-14772. RBF: hdfs-rbf-site.xml can't be loaded automatically. Contributed by Yuxuan Wang
---
.../src/main/java/org/apache/hadoop/hdfs/HdfsConfiguration.java | 1 +
.../apache/hadoop/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 ec615ca..65efaf9 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 a2bec12..489ff45 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.";
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org