HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.enable=false; checkstyle

Author: yulongz

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

@@ -187,23 +187,8 @@ protected void serviceInit(Configuration configuration) throws Exception {
       throw new IOException("Cannot find subcluster resolver");
     }
 
-    if (conf.getBoolean(
-        RBFConfigKeys.DFS_ROUTER_RPC_ENABLE,
-        RBFConfigKeys.DFS_ROUTER_RPC_ENABLE_DEFAULT)) {
-      // Create RPC server
-      this.rpcServer = createRpcServer();
-      addService(this.rpcServer);
-      this.setRpcServerAddress(rpcServer.getRpcAddress());
-    } else {
-      InetSocketAddress confRpcAddress = conf.getSocketAddr(
-              RBFConfigKeys.DFS_ROUTER_RPC_BIND_HOST_KEY,
-              RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_KEY,
-              RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_DEFAULT,
-              RBFConfigKeys.DFS_ROUTER_RPC_PORT_DEFAULT);
-
-      String hostname = InetAddress.getLocalHost().getHostName();
-      setRouterId(hostname + ":" + confRpcAddress.getPort());
-    }
+    // whether create rpc server or not, set routerId anyway.
+    setRpcServer();
 
     if (conf.getBoolean(
         RBFConfigKeys.DFS_ROUTER_ADMIN_ENABLE,
@@ -395,6 +380,26 @@ public void run() {
   // RPC Server
   /////////////////////////////////////////////////////////
 
+  private void setRpcServer() throws IOException {
+    if (conf.getBoolean(
+            RBFConfigKeys.DFS_ROUTER_RPC_ENABLE,
+            RBFConfigKeys.DFS_ROUTER_RPC_ENABLE_DEFAULT)) {
+      // Create RPC server
+      this.rpcServer = createRpcServer();
+      addService(this.rpcServer);
+      this.setRpcServerAddress(rpcServer.getRpcAddress());
+    } else {
+      InetSocketAddress confRpcAddress = conf.getSocketAddr(
+              RBFConfigKeys.DFS_ROUTER_RPC_BIND_HOST_KEY,
+              RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_KEY,
+              RBFConfigKeys.DFS_ROUTER_RPC_ADDRESS_DEFAULT,
+              RBFConfigKeys.DFS_ROUTER_RPC_PORT_DEFAULT);
+
+      String hostname = InetAddress.getLocalHost().getHostName();
+      setRouterId(hostname + ":" + confRpcAddress.getPort());
+    }
+  }
+
   /**
    * Create a new Router RPC server to proxy ClientProtocol requests.
    *

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

@@ -223,14 +223,14 @@ public void testRouterMetricsWhenDisabled() throws Exception {
 
   @Test
   public void testSwitchRouter() throws IOException {
-    assertRouterHeartbeater(true,true, true);
-    assertRouterHeartbeater(true,true, false);
-    assertRouterHeartbeater(true,false, true);
-    assertRouterHeartbeater(true,false, false);
-    assertRouterHeartbeater(false,true, true);
-    assertRouterHeartbeater(false,true, false);
-    assertRouterHeartbeater(false,false, true);
-    assertRouterHeartbeater(false,false, false);
+    assertRouterHeartbeater(true, true, true);
+    assertRouterHeartbeater(true, true, false);
+    assertRouterHeartbeater(true, false, true);
+    assertRouterHeartbeater(true, false, false);
+    assertRouterHeartbeater(false, true, true);
+    assertRouterHeartbeater(false, true, false);
+    assertRouterHeartbeater(false, false, true);
+    assertRouterHeartbeater(false, false, false);
   }
 
   /**