HDFS-16411 RBF: RouterId is NULL when set dfs.federation.router.rpc.enable=false; modify testSwitchRouter()

Author: yulongz

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

@@ -223,10 +223,14 @@ public void testRouterMetricsWhenDisabled() throws Exception {
 
   @Test
   public void testSwitchRouter() throws IOException {
-    assertRouterHeartbeater(true, true);
-    assertRouterHeartbeater(true, false);
-    assertRouterHeartbeater(false, true);
-    assertRouterHeartbeater(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);
   }
 
   /**
@@ -235,10 +239,10 @@ public void testSwitchRouter() throws IOException {
    * @param expectedRouterHeartbeat expect the routerHeartbeat enable state.
    * @param expectedNNHeartbeat expect the nnHeartbeat enable state.
    */
-  private void assertRouterHeartbeater(boolean expectedRouterHeartbeat,
+  private void assertRouterHeartbeater(boolean enableRpcServer, boolean expectedRouterHeartbeat,
       boolean expectedNNHeartbeat) throws IOException {
     final Router router = new Router();
-    Configuration baseCfg = new RouterConfigBuilder(conf).rpc(false).build();
+    Configuration baseCfg = new RouterConfigBuilder(conf).rpc(enableRpcServer).build();
     baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_HEARTBEAT_ENABLE,
         expectedRouterHeartbeat);
     baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_NAMENODE_HEARTBEAT_ENABLE,