HDFS-16296. Extract RouterRpcClient from RouterContext

Author: symious

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

@@ -86,6 +86,8 @@
 import org.apache.hadoop.hdfs.server.federation.resolver.NamenodeStatusReport;
 import org.apache.hadoop.hdfs.server.federation.router.Router;
 import org.apache.hadoop.hdfs.server.federation.router.RouterClient;
+import org.apache.hadoop.hdfs.server.federation.router.RouterRpcClient;
+import org.apache.hadoop.hdfs.server.federation.router.RouterRpcServer;
 import org.apache.hadoop.hdfs.server.namenode.FSImage;
 import org.apache.hadoop.hdfs.server.namenode.NameNode;
 import org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider;
@@ -267,6 +269,14 @@ public DFSClient getClient() throws IOException, URISyntaxException {
     public Configuration getConf() {
       return conf;
     }
+
+    public RouterRpcServer getRouterRpcServer() {
+      return router.getRpcServer();
+    }
+
+    public RouterRpcClient getRouterRpcClient() {
+      return getRouterRpcServer().getRPCClient();
+    }
   }
 
   /**

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

@@ -215,11 +215,10 @@ private void invokeConcurrent(ClientProtocol routerProto, String clientName)
   private int getTotalRejectedPermits(RouterContext routerContext) {
     int totalRejectedPermits = 0;
     for (String ns : cluster.getNameservices()) {
-      totalRejectedPermits += routerContext.getRouter().getRpcServer()
-          .getRPCClient().getRejectedPermitForNs(ns);
+      totalRejectedPermits += routerContext.getRouterRpcClient()
+          .getRejectedPermitForNs(ns);
     }
-    totalRejectedPermits += routerContext.getRouter().getRpcServer()
-        .getRPCClient()
+    totalRejectedPermits += routerContext.getRouterRpcClient()
         .getRejectedPermitForNs(RouterRpcFairnessConstants.CONCURRENT_NS);
     return totalRejectedPermits;
   }