errose28 commented on code in PR #11844: URL: https://github.com/apache/ozone/pull/11844#discussion_r4418280932
########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java: ########## @@ -0,0 +1,156 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.container.common.states.endpoint; + +import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.errorNodeNotPermitted; +import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.success; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.UUID; +import org.apache.hadoop.hdds.HDDSVersion; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReportsProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.PipelineReportsProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto; +import org.apache.hadoop.hdds.scm.net.HostAndPort; +import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; +import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine.DatanodeStates; +import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine; +import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine.EndPointStates; +import org.apache.hadoop.ozone.container.common.statemachine.StateContext; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; +import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; +import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB; +import org.junit.jupiter.api.Test; + +/** + * Tests for RegisterEndpointTask. + */ +public class TestRegisterEndpointTask { + + private static final String CLUSTER_ID = UUID.randomUUID().toString(); + + /** + * HDDS-17560: when Recon (a passive endpoint) returns errorNodeNotPermitted + * for any reason (e.g. InvalidTopologyException), the datanode must NOT shut + * down. The endpoint should stay in REGISTER so the next cycle retries. + */ + @Test + public void testPassiveEndpointNotPermittedDoesNotShutdown() throws Exception { + DatanodeDetails dn = newDatanodeDetails(); + EndPointStates result = runRegistration(dn, errorNodeNotPermitted, true); + + assertNotEquals(EndPointStates.SHUTDOWN, result, + "Passive (Recon) endpoint errorNodeNotPermitted must not trigger DN shutdown"); + assertEquals(EndPointStates.REGISTER, result, + "Endpoint should stay in REGISTER state for retry"); Review Comment: nit. After the `assertEquals`, `assertNotEquals` is redundant. ```suggestion assertEquals(EndPointStates.REGISTER, result, "Endpoint should stay in REGISTER state for retry"); ``` ########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java: ########## @@ -0,0 +1,156 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.ozone.container.common.states.endpoint; + +import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.errorNodeNotPermitted; +import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.success; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.UUID; +import org.apache.hadoop.hdds.HDDSVersion; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReportsProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.PipelineReportsProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto; +import org.apache.hadoop.hdds.scm.net.HostAndPort; +import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; +import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine.DatanodeStates; +import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine; +import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine.EndPointStates; +import org.apache.hadoop.ozone.container.common.statemachine.StateContext; +import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; +import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; +import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; +import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB; +import org.junit.jupiter.api.Test; + +/** + * Tests for RegisterEndpointTask. + */ +public class TestRegisterEndpointTask { + + private static final String CLUSTER_ID = UUID.randomUUID().toString(); + + /** + * HDDS-17560: when Recon (a passive endpoint) returns errorNodeNotPermitted + * for any reason (e.g. InvalidTopologyException), the datanode must NOT shut + * down. The endpoint should stay in REGISTER so the next cycle retries. + */ + @Test + public void testPassiveEndpointNotPermittedDoesNotShutdown() throws Exception { + DatanodeDetails dn = newDatanodeDetails(); + EndPointStates result = runRegistration(dn, errorNodeNotPermitted, true); + + assertNotEquals(EndPointStates.SHUTDOWN, result, + "Passive (Recon) endpoint errorNodeNotPermitted must not trigger DN shutdown"); + assertEquals(EndPointStates.REGISTER, result, + "Endpoint should stay in REGISTER state for retry"); + } + + /** + * HDDS-15482: when SCM (an active endpoint) returns errorNodeNotPermitted + * due to ZDU version fencing, the datanode must shut down. + */ + @Test + public void testActiveEndpointNotPermittedShutdown() throws Exception { + DatanodeDetails dn = newDatanodeDetails(); + EndPointStates result = runRegistration(dn, errorNodeNotPermitted, false); + + assertEquals(EndPointStates.SHUTDOWN, result, + "Active (SCM) endpoint errorNodeNotPermitted must trigger DN shutdown"); + } + + /** + * Sanity check: a successful registration from any endpoint advances state. + */ + @Test + public void testSuccessfulRegistrationAdvancesState() throws Exception { + DatanodeDetails dn = newDatanodeDetails(); + EndPointStates result = runRegistration(dn, success, false); Review Comment: Since this is now a general test class for the register endpoint, we should probably add another test for successful registration with `passive = true`. The diff I shared for this file just parameterizes it. ########## hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java: ########## Review Comment: Claude was able to consolidate the mocking setup in this file. - It found that the DN version manager mock was duplicated in multiple tests and moved all of them to a dedicated helper - Use the existing `ContainerTestUtils.createDatanodeDetails()` to create the datanode details - Constructing `DatanodeDetails` inside `runRegistration` instead of passing them in. ```diff diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java index 9971abb0f0..1f4e4739ed 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/ContainerTestUtils.java @@ -97,6 +97,7 @@ import org.apache.hadoop.ozone.container.ozoneimpl.DataScanResult; import org.apache.hadoop.ozone.container.ozoneimpl.MetadataScanResult; import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; +import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; import org.apache.hadoop.ozone.protocol.commands.ReplicateContainerCommand; import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB; import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolPB; @@ -177,6 +178,14 @@ public static StateContext getMockContext(DatanodeDetails datanodeDetails, return context; } + public static DatanodeVersionManager mockDnVersionManager() { + DatanodeVersionManager versionManager = mock(DatanodeVersionManager.class); + when(versionManager.getSoftwareVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); + when(versionManager.getApparentVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); + when(versionManager.getVersionForClient()).thenReturn(HDDSVersion.SOFTWARE_VERSION); + return versionManager; + } + public static DatanodeDetails createDatanodeDetails() { Random random = new Random(); String ipAddress = diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java index 1dd6fd02ad..c189351a2c 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTask.java @@ -52,6 +52,7 @@ import org.apache.hadoop.hdds.scm.net.HostAndPort; import org.apache.hadoop.hdds.upgrade.HDDSLayoutFeature; import org.apache.hadoop.hdfs.util.EnumCounters; +import org.apache.hadoop.ozone.container.common.ContainerTestUtils; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine.DatanodeStates; import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine; @@ -515,13 +516,9 @@ private DatanodeStateMachine mockDatanodeStateMachine() { .setHostName("localhost") .setIpAddress("127.0.0.1") .build(); - DatanodeVersionManager versionManager = mock(DatanodeVersionManager.class); - when(versionManager.getSoftwareVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getApparentVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getVersionForClient()).thenReturn(HDDSVersion.SOFTWARE_VERSION); DatanodeStateMachine mockDSM = mock(DatanodeStateMachine.class); when(mockDSM.getDatanodeDetails()).thenReturn(datanodeDetails); - when(mockDSM.getVersionManager()).thenReturn(versionManager); + when(mockDSM.getVersionManager()).thenReturn(ContainerTestUtils.mockDnVersionManager()); return mockDSM; } diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTaskDnsRefresh.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTaskDnsRefresh.java index e8c3f39110..cba5e16f2a 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTaskDnsRefresh.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestHeartbeatEndpointTaskDnsRefresh.java @@ -36,12 +36,12 @@ import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMCommandProto; import org.apache.hadoop.hdds.scm.net.HostAndPort; import org.apache.hadoop.hdfs.util.EnumCounters; +import org.apache.hadoop.ozone.container.common.ContainerTestUtils; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine.DatanodeStates; import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine; import org.apache.hadoop.ozone.container.common.statemachine.SCMConnectionManager; import org.apache.hadoop.ozone.container.common.statemachine.StateContext; -import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB; import org.junit.jupiter.api.Test; @@ -117,11 +117,7 @@ private SCMConnectionManager runHeartbeat(OzoneConfiguration conf, long missedCo .build(); when(dsm.getDatanodeDetails()).thenReturn(dn); - DatanodeVersionManager versionManager = mock(DatanodeVersionManager.class); - when(versionManager.getApparentVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getSoftwareVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getVersionForClient()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(dsm.getVersionManager()).thenReturn(versionManager); + when(dsm.getVersionManager()).thenReturn(ContainerTestUtils.mockDnVersionManager()); StateContext context = new StateContext(conf, DatanodeStates.RUNNING, dsm, ""); diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java index d2730e02bb..301eadc117 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/states/endpoint/TestRegisterEndpointTask.java @@ -20,21 +20,20 @@ import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.errorNodeNotPermitted; import static org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode.success; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.UUID; -import org.apache.hadoop.hdds.HDDSVersion; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.ContainerReportsProto; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.NodeReportProto; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.PipelineReportsProto; import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto; +import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos.SCMRegisteredResponseProto.ErrorCode; import org.apache.hadoop.hdds.scm.net.HostAndPort; +import org.apache.hadoop.ozone.container.common.ContainerTestUtils; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine; import org.apache.hadoop.ozone.container.common.statemachine.DatanodeStateMachine.DatanodeStates; import org.apache.hadoop.ozone.container.common.statemachine.EndpointStateMachine; @@ -42,9 +41,10 @@ import org.apache.hadoop.ozone.container.common.statemachine.StateContext; import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; -import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; import org.apache.hadoop.ozone.protocolPB.StorageContainerDatanodeProtocolClientSideTranslatorPB; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; /** * Tests for RegisterEndpointTask. @@ -60,13 +60,8 @@ public class TestRegisterEndpointTask { */ @Test public void testPassiveEndpointNotPermittedDoesNotShutdown() throws Exception { - DatanodeDetails dn = newDatanodeDetails(); - EndPointStates result = runRegistration(dn, errorNodeNotPermitted, true); - - assertNotEquals(EndPointStates.SHUTDOWN, result, - "Passive (Recon) endpoint errorNodeNotPermitted must not trigger DN shutdown"); - assertEquals(EndPointStates.REGISTER, result, - "Endpoint should stay in REGISTER state for retry"); + assertEquals(EndPointStates.REGISTER, runRegistration(errorNodeNotPermitted, true), + "Passive (Recon) endpoint errorNodeNotPermitted must not shut down the DN and must stay in REGISTER"); } /** @@ -75,82 +70,51 @@ public void testPassiveEndpointNotPermittedDoesNotShutdown() throws Exception { */ @Test public void testActiveEndpointNotPermittedShutdown() throws Exception { - DatanodeDetails dn = newDatanodeDetails(); - EndPointStates result = runRegistration(dn, errorNodeNotPermitted, false); - - assertEquals(EndPointStates.SHUTDOWN, result, + assertEquals(EndPointStates.SHUTDOWN, runRegistration(errorNodeNotPermitted, false), "Active (SCM) endpoint errorNodeNotPermitted must trigger DN shutdown"); } /** * Sanity check: a successful registration from any endpoint advances state. */ - @Test - public void testSuccessfulRegistrationAdvancesState() throws Exception { - DatanodeDetails dn = newDatanodeDetails(); - EndPointStates result = runRegistration(dn, success, false); - - assertEquals(EndPointStates.HEARTBEAT, result); + @ParameterizedTest + @ValueSource(booleans = {true, false}) + public void testSuccessfulRegistrationAdvancesState(boolean passive) throws Exception { + assertEquals(EndPointStates.HEARTBEAT, runRegistration(success, passive)); } - private EndPointStates runRegistration(DatanodeDetails dn, - SCMRegisteredResponseProto.ErrorCode errorCode, boolean passive) throws Exception { + private EndPointStates runRegistration(ErrorCode errorCode, boolean passive) throws Exception { + DatanodeDetails dn = ContainerTestUtils.createDatanodeDetails(); StorageContainerDatanodeProtocolClientSideTranslatorPB rpc = mock(StorageContainerDatanodeProtocolClientSideTranslatorPB.class); - when(rpc.register(any(), any(), any(), any(), any())) - .thenReturn(registrationResponse(dn.getUuidString(), errorCode)); - - EndpointStateMachine endpointStateMachine = buildEndpointStateMachine(rpc, passive); - RegisterEndpointTask task = buildTask(dn, endpointStateMachine); - return task.call(); + when(rpc.register(any(), any(), any(), any(), any())).thenReturn( + SCMRegisteredResponseProto.newBuilder() + .setErrorCode(errorCode) + .setDatanodeUUID(dn.getUuidString()) + .setClusterID(CLUSTER_ID) + .build()); + + EndpointStateMachine endpoint = new EndpointStateMachine( + new HostAndPort("localhost", 9861), rpc, new OzoneConfiguration(), "test-"); + endpoint.setPassive(passive); + endpoint.setState(EndPointStates.REGISTER); + return new RegisterEndpointTask(endpoint, mockOzoneContainer(), newStateContext(dn)).call(); } - private RegisterEndpointTask buildTask(DatanodeDetails dn, - EndpointStateMachine endpointStateMachine) throws Exception { - DatanodeVersionManager versionManager = mock(DatanodeVersionManager.class); - when(versionManager.getSoftwareVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getApparentVersion()).thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getVersionForClient()).thenReturn(HDDSVersion.SOFTWARE_VERSION); + private static StateContext newStateContext(DatanodeDetails dn) { DatanodeStateMachine datanodeStateMachine = mock(DatanodeStateMachine.class); when(datanodeStateMachine.getDatanodeDetails()).thenReturn(dn); - when(datanodeStateMachine.getVersionManager()).thenReturn(versionManager); - - OzoneConfiguration conf = new OzoneConfiguration(); - StateContext context = new StateContext(conf, DatanodeStates.RUNNING, datanodeStateMachine, ""); + when(datanodeStateMachine.getVersionManager()).thenReturn(ContainerTestUtils.mockDnVersionManager()); + return new StateContext(new OzoneConfiguration(), DatanodeStates.RUNNING, datanodeStateMachine, ""); + } + private static OzoneContainer mockOzoneContainer() { ContainerController controller = mock(ContainerController.class); - doReturn(ContainerReportsProto.getDefaultInstance()).when(controller).getContainerReport(); + when(controller.getContainerReport()).thenReturn(ContainerReportsProto.getDefaultInstance()); OzoneContainer ozoneContainer = mock(OzoneContainer.class); when(ozoneContainer.getController()).thenReturn(controller); - doReturn(NodeReportProto.getDefaultInstance()).when(ozoneContainer).getNodeReport(); + when(ozoneContainer.getNodeReport()).thenReturn(NodeReportProto.getDefaultInstance()); when(ozoneContainer.getPipelineReport()).thenReturn(PipelineReportsProto.getDefaultInstance()); - - return new RegisterEndpointTask(endpointStateMachine, ozoneContainer, context); - } - - private EndpointStateMachine buildEndpointStateMachine( - StorageContainerDatanodeProtocolClientSideTranslatorPB rpc, boolean passive) { - EndpointStateMachine machine = new EndpointStateMachine( - new HostAndPort("localhost", 9861), rpc, new OzoneConfiguration(), "test-"); - machine.setPassive(passive); - machine.setState(EndPointStates.REGISTER); - return machine; - } - - private static DatanodeDetails newDatanodeDetails() { - return DatanodeDetails.newBuilder() - .setUuid(UUID.randomUUID()) - .setHostName("localhost") - .setIpAddress("127.0.0.1") - .build(); - } - - private static SCMRegisteredResponseProto registrationResponse( - String datanodeUUID, SCMRegisteredResponseProto.ErrorCode errorCode) { - return SCMRegisteredResponseProto.newBuilder() - .setErrorCode(errorCode) - .setDatanodeUUID(datanodeUUID) - .setClusterID(CLUSTER_ID) - .build(); + return ozoneContainer; } } 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 caf36cf774..895a861c24 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 @@ -80,7 +80,6 @@ import org.apache.hadoop.ozone.container.ozoneimpl.ContainerController; import org.apache.hadoop.ozone.container.ozoneimpl.OzoneContainer; import org.apache.hadoop.ozone.container.replication.ReplicationServer.ReplicationConfig; -import org.apache.hadoop.ozone.container.upgrade.DatanodeVersionManager; import org.apache.hadoop.ozone.protocol.commands.CommandStatus; import org.apache.hadoop.util.Time; import org.apache.ozone.test.GenericTestUtils.LogCapturer; @@ -431,16 +430,8 @@ private RegisterEndpointTask getRegisterEndpointTask(boolean clearDatanodeDetail when(ozoneContainer.getController()).thenReturn(controller); when(ozoneContainer.getPipelineReport()).thenReturn( HddsTestUtils.getRandomPipelineReports()); - DatanodeVersionManager versionManager = - mock(DatanodeVersionManager.class); - when(versionManager.getApparentVersion()) - .thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getSoftwareVersion()) - .thenReturn(HDDSVersion.SOFTWARE_VERSION); - when(versionManager.getVersionForClient()) - .thenReturn(HDDSVersion.SOFTWARE_VERSION); DatanodeStateMachine dn = mock(DatanodeStateMachine.class); - when(dn.getVersionManager()).thenReturn(versionManager); + when(dn.getVersionManager()).thenReturn(ContainerTestUtils.mockDnVersionManager()); if (!clearDatanodeDetails) { when(dn.getDatanodeDetails()).thenReturn(randomDatanodeDetails()); } ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
