HDFS-14036. RBF: Add hdfs-rbf-default.xml to HdfsConfiguration by default. Contributed by Takanobu Asanuma.

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

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

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterClientProtocol.java

@@ -153,7 +153,7 @@ public class RouterClientProtocol implements ClientProtocol {
     this.mountStatusTimeOut = conf.getTimeDuration(
         RBFConfigKeys.DFS_ROUTER_CLIENT_MOUNT_TIME_OUT,
         RBFConfigKeys.DFS_ROUTER_CLIENT_MOUNT_TIME_OUT_DEFAULT,
-        TimeUnit.SECONDS);
+        TimeUnit.MILLISECONDS);
 
     // User and group for reporting
     try {

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/fs/contract/router/RouterHDFSContract.java

@@ -58,7 +58,6 @@ public class RouterHDFSContract extends HDFSContract {
       // Start NNs and DNs and wait until ready
       cluster.startCluster(conf);
 
-      cluster.addRouterOverrides(conf);
       // Start routers with only an RPC service
       cluster.startRouters();
 

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/fs/contract/router/web/RouterWebHDFSContract.java

@@ -68,7 +68,6 @@ public class RouterWebHDFSContract extends HDFSContract {
       // Start NNs and DNs and wait until ready
       cluster.startCluster(conf);
 
-      cluster.addRouterOverrides(conf);
       // Start routers with only an RPC service
       cluster.startRouters();
 

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java

@@ -136,6 +136,8 @@ public class MiniRouterDFSCluster {
   /** Cache flush interval in milliseconds. */
   private long cacheFlushInterval;
 
+  /** Router configuration initializes. */
+  private Configuration routerConf;
   /** Router configuration overrides. */
   private Configuration routerOverrides;
   /** Namenode configuration overrides. */
@@ -533,7 +535,12 @@ public class MiniRouterDFSCluster {
    */
   public Configuration generateRouterConfiguration(String nsId, String nnId) {
 
-    Configuration conf = new HdfsConfiguration(false);
+    Configuration conf;
+    if (this.routerConf == null) {
+      conf = new Configuration(false);
+    } else {
+      conf = new Configuration(routerConf);
+    }
     conf.addResource(generateNamenodeConfiguration(nsId));
 
     conf.setInt(DFS_ROUTER_HANDLER_COUNT_KEY, 10);
@@ -778,6 +785,8 @@ public class MiniRouterDFSCluster {
       Configuration nnConf = generateNamenodeConfiguration(ns0);
       if (overrideConf != null) {
         nnConf.addResource(overrideConf);
+        // Router also uses this configurations as initial values.
+        routerConf = new Configuration(overrideConf);
       }
 
       cluster = new MiniDFSCluster.Builder(nnConf)