HDFS-16411 RBF: RouterId is NULL when disable RourterRpcServer

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

@@ -194,6 +194,15 @@ protected void serviceInit(Configuration configuration) throws Exception {
       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());
     }
 
     if (conf.getBoolean(

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

@@ -238,12 +238,16 @@ public void testSwitchRouter() throws IOException {
   private void assertRouterHeartbeater(boolean expectedRouterHeartbeat,
       boolean expectedNNHeartbeat) throws IOException {
     final Router router = new Router();
-    Configuration baseCfg = new RouterConfigBuilder(conf).rpc().build();
+    Configuration baseCfg = new RouterConfigBuilder(conf).rpc(false).build();
     baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_HEARTBEAT_ENABLE,
         expectedRouterHeartbeat);
     baseCfg.setBoolean(RBFConfigKeys.DFS_ROUTER_NAMENODE_HEARTBEAT_ENABLE,
         expectedNNHeartbeat);
     router.init(baseCfg);
+
+    // RouterId can not be null , used by RouterHeartbeatService.updateStateStore()
+    assertNotNull(router.getRouterId());
+
     RouterHeartbeatService routerHeartbeatService =
         router.getRouterHeartbeatService();
     if (expectedRouterHeartbeat) {

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

@@ -57,7 +57,6 @@ public class TestRouterHeartbeatService {
   @Before
   public void setup() throws Exception {
     router = new Router();
-    router.setRouterId(routerId);
     Configuration conf = new Configuration();
     conf.setInt(RBFConfigKeys.DFS_ROUTER_CACHE_TIME_TO_LIVE_MS, 1);
     Configuration routerConfig =
@@ -76,6 +75,8 @@ public void setup() throws Exception {
     curatorFramework.start();
     routerConfig.set(CommonConfigurationKeys.ZK_ADDRESS, connectStr);
     router.init(routerConfig);
+    // set custom routerid after router.init()
+    router.setRouterId(routerId);
     router.start();