HDFS-3880. Use Builder to build RPC server in HDFS. Contributed by Brandon Li and Junping Du

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507579 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -263,6 +263,9 @@ Release 2.1.0-beta - 2013-07-02
     HDFS-5024. Make DatanodeProtocol#commitBlockSynchronization idempotent. 
     (Arpit Agarwal via jing9)
 
+    HDFS-3880. Use Builder to build RPC server in HDFS.
+    (Brandon Li and Junping Du via szetszwo)
+
   OPTIMIZATIONS
 
     HDFS-4465. Optimize datanode ReplicasMap and ReplicaInfo. (atm)

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -450,10 +450,15 @@ public class DataNode extends Configured
           new ClientDatanodeProtocolServerSideTranslatorPB(this);
     BlockingService service = ClientDatanodeProtocolService
         .newReflectiveBlockingService(clientDatanodeProtocolXlator);
-    ipcServer = RPC.getServer(ClientDatanodeProtocolPB.class, service, ipcAddr
+    ipcServer = new RPC.Builder(conf)
-        .getHostName(), ipcAddr.getPort(), conf.getInt(
+        .setProtocol(ClientDatanodeProtocolPB.class)
-        DFS_DATANODE_HANDLER_COUNT_KEY, DFS_DATANODE_HANDLER_COUNT_DEFAULT),
+        .setInstance(service)
-        false, conf, blockPoolTokenSecretManager);
+        .setBindAddress(ipcAddr.getHostName())
+        .setPort(ipcAddr.getPort())
+        .setNumHandlers(
+            conf.getInt(DFS_DATANODE_HANDLER_COUNT_KEY,
+                DFS_DATANODE_HANDLER_COUNT_DEFAULT)).setVerbose(false)
+        .setSecretManager(blockPoolTokenSecretManager).build();
     
     InterDatanodeProtocolServerSideTranslatorPB interDatanodeProtocolXlator = 
         new InterDatanodeProtocolServerSideTranslatorPB(this);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java

@@ -220,12 +220,15 @@ class NameNodeRpcServer implements NamenodeProtocols {
       int serviceHandlerCount =
         conf.getInt(DFS_NAMENODE_SERVICE_HANDLER_COUNT_KEY,
                     DFS_NAMENODE_SERVICE_HANDLER_COUNT_DEFAULT);
-      this.serviceRpcServer = 
+      this.serviceRpcServer = new RPC.Builder(conf)
-          RPC.getServer(org.apache.hadoop.hdfs.protocolPB.
+          .setProtocol(
-              ClientNamenodeProtocolPB.class, clientNNPbService,
+              org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB.class)
-          serviceRpcAddr.getHostName(), serviceRpcAddr.getPort(), 
+          .setInstance(clientNNPbService)
-          serviceHandlerCount,
+          .setBindAddress(serviceRpcAddr.getHostName())
-          false, conf, namesystem.getDelegationTokenSecretManager());
+          .setPort(serviceRpcAddr.getPort()).setNumHandlers(serviceHandlerCount)
+          .setVerbose(false)
+          .setSecretManager(namesystem.getDelegationTokenSecretManager())
+          .build();
 
       // Add all the RPC protocols that the namenode implements
       DFSUtil.addPBProtocol(conf, HAServiceProtocolPB.class, haPbService,
@@ -248,11 +251,13 @@ class NameNodeRpcServer implements NamenodeProtocols {
       serviceRPCAddress = null;
     }
     InetSocketAddress rpcAddr = nn.getRpcServerAddress(conf);
-    this.clientRpcServer = RPC.getServer(
+    this.clientRpcServer = new RPC.Builder(conf)
-        org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB.class, 
+        .setProtocol(
-        clientNNPbService, rpcAddr.getHostName(),
+            org.apache.hadoop.hdfs.protocolPB.ClientNamenodeProtocolPB.class)
-            rpcAddr.getPort(), handlerCount, false, conf,
+        .setInstance(clientNNPbService).setBindAddress(rpcAddr.getHostName())
-            namesystem.getDelegationTokenSecretManager());
+        .setPort(rpcAddr.getPort()).setNumHandlers(handlerCount)
+        .setVerbose(false)
+        .setSecretManager(namesystem.getDelegationTokenSecretManager()).build();
 
     // Add all the RPC protocols that the namenode implements
     DFSUtil.addPBProtocol(conf, HAServiceProtocolPB.class, haPbService,

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java

@@ -80,9 +80,11 @@ public class TestClientProtocolWithDelegationToken {
         DFSConfigKeys.DFS_NAMENODE_DELEGATION_TOKEN_MAX_LIFETIME_DEFAULT,
         3600000, mockNameSys);
     sm.startThreads();
-    final Server server = RPC.getServer(ClientProtocol.class, mockNN, ADDRESS,
+    final Server server = new RPC.Builder(conf)
-        0, 5, true, conf, sm);
+        .setProtocol(ClientProtocol.class).setInstance(mockNN)
-
+        .setBindAddress(ADDRESS).setPort(0).setNumHandlers(5).setVerbose(true)
+        .setSecretManager(sm).build();
+    
     server.start();
 
     final UserGroupInformation current = UserGroupInformation.getCurrentUser();

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java

@@ -232,8 +232,9 @@ public class TestBlockToken {
         ProtobufRpcEngine.class);
     BlockingService service = ClientDatanodeProtocolService
         .newReflectiveBlockingService(mockDN);
-    return RPC.getServer(ClientDatanodeProtocolPB.class, service, ADDRESS, 0, 5,
+    return new RPC.Builder(conf).setProtocol(ClientDatanodeProtocolPB.class)
-        true, conf, sm);
+        .setInstance(service).setBindAddress(ADDRESS).setPort(0)
+        .setNumHandlers(5).setVerbose(true).setSecretManager(sm).build();
   }
 
   @Test