From d72c16516184479e82a73d3e211e2883be779908 Mon Sep 17 00:00:00 2001 From: Mukul Kumar Singh Date: Tue, 8 May 2018 18:11:33 +0530 Subject: [PATCH] HDDS-23. Remove SCMNodeAddressList from SCMRegisterRequestProto. Contributed by Nanda Kumar. --- .../common/states/endpoint/RegisterEndpointTask.java | 3 +-- .../ozone/protocol/StorageContainerDatanodeProtocol.java | 7 +++---- ...eContainerDatanodeProtocolClientSideTranslatorPB.java | 3 +-- ...eContainerDatanodeProtocolServerSideTranslatorPB.java | 9 +-------- .../main/proto/StorageContainerDatanodeProtocol.proto | 1 - .../hadoop/ozone/container/common/ScmTestMock.java | 4 +--- .../hdds/scm/server/SCMDatanodeProtocolServer.java | 7 +++---- .../hadoop/ozone/container/common/TestEndPoint.java | 4 +--- 8 files changed, 11 insertions(+), 27 deletions(-) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java index ca3bef0b35..42568e3ad3 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java +++ b/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(), - conf.getStrings(ScmConfigKeys.OZONE_SCM_NAMES)); + .register(datanodeDetails.getProtoBufMessage()); Preconditions.checkState(UUID.fromString(response.getDatanodeUUID()) .equals(datanodeDetails.getUuid()), "Unexpected datanode ID in the response."); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java index 43e7412aea..cb65727630 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/StorageContainerDatanodeProtocol.java +++ b/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, - String[] scmAddresses) throws IOException; + SCMRegisteredCmdResponseProto register(DatanodeDetailsProto datanodeDetails) + throws IOException; /** * Send a container report. diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java index 12fed1cd0f..13162de7d3 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java +++ b/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, - String[] scmAddresses) throws IOException { + DatanodeDetailsProto datanodeDetailsProto) throws IOException { SCMRegisterRequestProto.Builder req = SCMRegisterRequestProto.newBuilder(); req.setDatanodeDetails(datanodeDetailsProto); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolServerSideTranslatorPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolServerSideTranslatorPB.java index 985b75acd6..25757aa345 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolServerSideTranslatorPB.java +++ b/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); } diff --git a/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto b/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto index bc7fb7a7a3..4d5795aae8 100644 --- a/hadoop-hdds/container-service/src/main/proto/StorageContainerDatanodeProtocol.proto +++ b/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; } /** diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java index 764ccfdda7..703878c117 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ScmTestMock.java +++ b/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(); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java index e42b887044..cb7a484f19 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java +++ b/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, - StorageContainerDatanodeProtocolProtos.SCMNodeAddressList addressList) { + SCMCommand cmd) { Preconditions.checkState(cmd.getClass() == RegisteredCommand.class); RegisteredCommand rCmd = (RegisteredCommand) cmd; SCMCmdType type = cmd.getType(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java index ebfe978d48..0f9125baa1 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/container/common/TestEndPoint.java +++ b/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());