HDDS-23. Remove SCMNodeAddressList from SCMRegisterRequestProto. Contributed by Nanda Kumar.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java

@@ -99,8 +99,7 @@ public EndpointStateMachine.EndPointStates call() throws Exception {
 
       // TODO : Add responses to the command Queue.
       SCMRegisteredCmdResponseProto response = rpcEndPoint.getEndPoint()
-          .register(datanodeDetails.getProtoBufMessage(),
+          .register(datanodeDetails.getProtoBufMessage());
-              conf.getStrings(ScmConfigKeys.OZONE_SCM_NAMES));
       Preconditions.checkState(UUID.fromString(response.getDatanodeUUID())
               .equals(datanodeDetails.getUuid()),
           "Unexpected datanode ID in the response.");

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java

@@ -69,12 +69,11 @@ SCMHeartbeatResponseProto sendHeartbeat(DatanodeDetailsProto datanodeDetails,
   /**
    * Register Datanode.
    * @param datanodeDetails - Datanode Details.
-   * @param scmAddresses - List of SCMs this datanode is configured to
+   *
-   *                     communicate.
    * @return SCM Command.
    */
-  SCMRegisteredCmdResponseProto register(DatanodeDetailsProto datanodeDetails,
+  SCMRegisteredCmdResponseProto register(DatanodeDetailsProto datanodeDetails)
-      String[] scmAddresses) throws IOException;
+      throws IOException;
 
   /**
    * Send a container report.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java

@@ -156,8 +156,7 @@ public SCMHeartbeatResponseProto sendHeartbeat(
    */
   @Override
   public SCMRegisteredCmdResponseProto register(
-      DatanodeDetailsProto datanodeDetailsProto,
+      DatanodeDetailsProto datanodeDetailsProto) throws IOException {
-      String[] scmAddresses) throws IOException {
     SCMRegisterRequestProto.Builder req =
         SCMRegisterRequestProto.newBuilder();
     req.setDatanodeDetails(datanodeDetailsProto);

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolServerSideTranslatorPB.java

@@ -68,15 +68,8 @@ public StorageContainerDatanodeProtocolServerSideTranslatorPB(
   public StorageContainerDatanodeProtocolProtos.SCMRegisteredCmdResponseProto
       register(RpcController controller, StorageContainerDatanodeProtocolProtos
       .SCMRegisterRequestProto request) throws ServiceException {
-    String[] addressArray = null;
-
-    if (request.hasAddressList()) {
-      addressArray = request.getAddressList().getAddressListList()
-          .toArray(new String[0]);
-    }
-
     try {
-      return impl.register(request.getDatanodeDetails(), addressArray);
+      return impl.register(request.getDatanodeDetails());
     } catch (IOException e) {
       throw new ServiceException(e);
     }

hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto

@@ -146,7 +146,6 @@ message SCMStorageReport {
 
 message SCMRegisterRequestProto {
   required DatanodeDetailsProto datanodeDetails = 1;
-  optional SCMNodeAddressList addressList = 2;
 }
 
 /**

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java

@@ -195,14 +195,12 @@ private void sleepIfNeeded() {
    * Register Datanode.
    *
    * @param datanodeDetailsProto DatanodDetailsProto.
-   * @param scmAddresses - List of SCMs this datanode is configured to
-   * communicate.
    * @return SCM Command.
    */
   @Override
   public StorageContainerDatanodeProtocolProtos
       .SCMRegisteredCmdResponseProto register(
-          DatanodeDetailsProto datanodeDetailsProto, String[] scmAddresses)
+          DatanodeDetailsProto datanodeDetailsProto)
       throws IOException {
     rpcCount.incrementAndGet();
     sleepIfNeeded();

hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java

@@ -167,17 +167,16 @@ public SCMHeartbeatResponseProto sendHeartbeat(
 
   @Override
   public SCMRegisteredCmdResponseProto register(
-      HddsProtos.DatanodeDetailsProto datanodeDetails, String[] scmAddresses)
+      HddsProtos.DatanodeDetailsProto datanodeDetails)
       throws IOException {
     // TODO : Return the list of Nodes that forms the SCM HA.
     return getRegisteredResponse(scm.getScmNodeManager()
-        .register(datanodeDetails), null);
+        .register(datanodeDetails));
   }
 
   @VisibleForTesting
   public static SCMRegisteredCmdResponseProto getRegisteredResponse(
-        SCMCommand cmd,
+        SCMCommand cmd) {
-        StorageContainerDatanodeProtocolProtos.SCMNodeAddressList addressList) {
     Preconditions.checkState(cmd.getClass() == RegisteredCommand.class);
     RegisteredCommand rCmd = (RegisteredCommand) cmd;
     SCMCmdType type = cmd.getType();

hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java

@@ -203,14 +203,12 @@ public void testGetVersionAssertRpcTimeOut() throws Exception {
 
   @Test
   public void testRegister() throws Exception {
-    String[] scmAddressArray = new String[1];
-    scmAddressArray[0] = serverAddress.toString();
     DatanodeDetails nodeToRegister = getDatanodeDetails();
     try (EndpointStateMachine rpcEndPoint =
              createEndpoint(
                  SCMTestUtils.getConf(), serverAddress, 1000)) {
       SCMRegisteredCmdResponseProto responseProto = rpcEndPoint.getEndPoint()
-          .register(nodeToRegister.getProtoBufMessage(), scmAddressArray);
+          .register(nodeToRegister.getProtoBufMessage());
       Assert.assertNotNull(responseProto);
       Assert.assertEquals(nodeToRegister.getUuidString(),
           responseProto.getDatanodeUUID());