From a48e4b7f47c28d4514b2773043f8b89a822f6263 Mon Sep 17 00:00:00 2001 From: Tsz-Wo Nicholas Sze Date: Fri, 3 Jul 2026 09:04:41 -0700 Subject: [PATCH] HDDS-15736. Change tests to use ContainerID.getIdForTesting(). --- .../TestReconcileContainerCommandHandler.java | 2 +- .../apache/hadoop/hdds/scm/HddsTestUtils.java | 2 +- .../container/TestContainerReportHandler.java | 2 +- .../container/TestContainerStateManager.java | 6 +- ...TestIncrementalContainerReportHandler.java | 2 +- .../container/TestUnknownContainerReport.java | 2 +- .../TestReconcileContainerEventHandler.java | 2 +- .../node/DatanodeAdminMonitorTestUtil.java | 4 +- .../scm/node/TestDatanodeAdminMonitor.java | 4 +- .../scm/node/TestNodeDecommissionManager.java | 2 +- .../recon/TestReconAndAdminContainerCLI.java | 2 +- .../scm/storage/TestContainerCommandsEC.java | 2 +- .../TestContainerReportHandling.java | 2 +- .../commandhandler/TestBlockDeletion.java | 8 +- .../TestCloseContainerHandler.java | 8 +- .../TestDeleteContainerHandler.java | 120 +++++++++--------- .../commandhandler/TestFinalizeBlock.java | 12 +- .../ozoneimpl/TestSecureOzoneContainer.java | 2 +- .../ozone/recon/api/TestBlocksEndPoint.java | 2 +- .../recon/api/TestContainerEndpoint.java | 4 +- .../AbstractReconContainerManagerTest.java | 8 +- .../recon/scm/TestReconContainerManager.java | 4 +- ...econIncrementalContainerReportHandler.java | 8 +- .../TestReconSCMContainerSyncIntegration.java | 2 +- 24 files changed, 106 insertions(+), 106 deletions(-) diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestReconcileContainerCommandHandler.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestReconcileContainerCommandHandler.java index 72969f976e58..3ce546214aba 100644 --- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestReconcileContainerCommandHandler.java +++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestReconcileContainerCommandHandler.java @@ -177,7 +177,7 @@ private void verifyAllContainerReports(Map r for (Map.Entry entry: reportsSent.entrySet()) { ContainerID id = entry.getKey(); - assertNotNull(containerSet.getContainer(id.getId())); + assertNotNull(containerSet.getContainer(id.getIdForTesting())); long sentDataChecksum = entry.getValue().getDataChecksum(); // Current implementation is incomplete, and uses a mocked checksum. diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java index 148ac62509a6..71f60032fe1b 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/HddsTestUtils.java @@ -849,7 +849,7 @@ public static ContainerReplicaProto createContainerReplica( int replicaIndex) { return ContainerReplicaProto.newBuilder() - .setContainerID(containerId.getId()) + .setContainerID(containerId.getIdForTesting()) .setState(state) .setOriginNodeId(originNodeId) .setFinalhash("e16cc9d6024365750ed8dbd194ea46d2") diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java index 24d005e98154..d5af2ccc839f 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerReportHandler.java @@ -1481,7 +1481,7 @@ protected static ContainerReportsProto getContainerReportsProto( ContainerReportsProto.newBuilder(); final ContainerReplicaProto replicaProto = ContainerReplicaProto.newBuilder() - .setContainerID(containerId.getId()) + .setContainerID(containerId.getIdForTesting()) .setState(state) .setOriginNodeId(originNodeId) .setSize(5368709120L) diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java index dd5344f4f119..3d3f57268cec 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManager.java @@ -366,7 +366,7 @@ private DeleteContainerCommand sendReportAndCaptureDeleteCommand( private void verifyForceDeleteCommand(DeleteContainerCommand deleteCmd, ContainerID expectedContainerId, boolean expectedForce, String message) { assertEquals(expectedForce, deleteCmd.isForce(), message); - assertEquals(expectedContainerId.getId(), deleteCmd.getContainerID()); + assertEquals(expectedContainerId.getIdForTesting(), deleteCmd.getContainerID()); } /** @@ -413,7 +413,7 @@ public void testReinitializeWithOpenContainerWithoutPipelineID() throws Exception { ContainerID containerID = ContainerID.valueOf(3L); ContainerInfo openContainerInfo = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setState(HddsProtos.LifeCycleState.OPEN) .setSequenceId(100L) .setOwner("scm") @@ -439,7 +439,7 @@ public void testSequenceIdOnStateUpdate() throws Exception { long sequenceId = 100L; ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setState(HddsProtos.LifeCycleState.OPEN) .setSequenceId(sequenceId) .setOwner("scm") diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java index 1afbb656043a..d7b76aad1670 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestIncrementalContainerReportHandler.java @@ -779,7 +779,7 @@ public void testWithContainerDataChecksum() throws Exception { final long bcsId) { final ContainerReplicaProto.Builder replicaProto = ContainerReplicaProto.newBuilder() - .setContainerID(containerId.getId()) + .setContainerID(containerId.getIdForTesting()) .setState(state) .setOriginNodeId(originNodeId) .setSize(5368709120L) diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java index 76979d8bdb6c..a391c2169982 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/TestUnknownContainerReport.java @@ -133,7 +133,7 @@ private static ContainerReportsProto getContainerReportsProto( ContainerReportsProto.newBuilder(); final ContainerReplicaProto replicaProto = ContainerReplicaProto.newBuilder() - .setContainerID(containerId.getId()) + .setContainerID(containerId.getIdForTesting()) .setState(state) .setOriginNodeId(originNodeId) .setFinalhash("e16cc9d6024365750ed8dbd194ea46d2") diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/reconciliation/TestReconcileContainerEventHandler.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/reconciliation/TestReconcileContainerEventHandler.java index e4ca940cf561..cebd376a05eb 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/reconciliation/TestReconcileContainerEventHandler.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/reconciliation/TestReconcileContainerEventHandler.java @@ -281,7 +281,7 @@ public void testReconcileFailsWithIneligibleReplicas(State replicaState) throws private ContainerInfo addContainer(ReplicationConfig repConfig, LifeCycleState state) throws Exception { ContainerInfo container = new ContainerInfo.Builder() - .setContainerID(CONTAINER_ID.getId()) + .setContainerID(CONTAINER_ID.getIdForTesting()) .setReplicationConfig(repConfig) .setState(state) .build(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorTestUtil.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorTestUtil.java index 07f7fc3d52ce..651a559677bd 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorTestUtil.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorTestUtil.java @@ -101,7 +101,7 @@ public static ContainerReplicaCount generateReplicaCount( MockDatanodeDetails.randomDatanodeDetails())); } ContainerInfo container = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setState(containerState) .build(); @@ -132,7 +132,7 @@ public static ContainerReplicaCount generateECReplicaCount( t.getRight(), t.getMiddle())); } ContainerInfo container = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setState(containerState) .setReplicationConfig(repConfig) .build(); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java index 43bdef519f8a..8318ace59c67 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDatanodeAdminMonitor.java @@ -247,7 +247,7 @@ public void testDecommissionWaitsForUnhealthyReplicaToReplicateNewRM() // the container's sequence id is greater than the healthy replicas' ContainerInfo container = ReplicationTestUtil.createContainerInfo( RatisReplicationConfig.getInstance( - HddsProtos.ReplicationFactor.THREE), containerID.getId(), + HddsProtos.ReplicationFactor.THREE), containerID.getIdForTesting(), HddsProtos.LifeCycleState.QUASI_CLOSED, replicas.iterator().next().getSequenceId() + 1); // UNHEALTHY replica is on a unique origin and has same sequence id as @@ -311,7 +311,7 @@ public void testDecommissionWaitsForUnhealthyReplicaWithUniqueOriginToReplicateN // create a container and 3 QUASI_CLOSED replicas with containerID 1 and same origin ID ContainerID containerID = ContainerID.valueOf(1); ContainerInfo container = ReplicationTestUtil.createContainerInfo(RatisReplicationConfig.getInstance( - HddsProtos.ReplicationFactor.THREE), containerID.getId(), HddsProtos.LifeCycleState.QUASI_CLOSED); + HddsProtos.ReplicationFactor.THREE), containerID.getIdForTesting(), HddsProtos.LifeCycleState.QUASI_CLOSED); Set replicas = ReplicationTestUtil.createReplicasWithSameOrigin(containerID, State.QUASI_CLOSED, 0, 0, 0); diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java index e740f9719e9f..4a3ccecd7257 100644 --- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestNodeDecommissionManager.java @@ -104,7 +104,7 @@ private ContainerInfo createMockContainer(ReplicationConfig rep, String owner) { private ContainerInfo getMockContainer(ReplicationConfig rep, ContainerID conId) { ContainerInfo.Builder builder = new ContainerInfo.Builder() .setReplicationConfig(rep) - .setContainerID(conId.getId()) + .setContainerID(conId.getIdForTesting()) .setPipelineID(PipelineID.randomId()) .setState(OPEN) .setOwner("admin"); diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java index 9514c05d6b28..f1c41e9d53dd 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconAndAdminContainerCLI.java @@ -382,7 +382,7 @@ private static boolean assertReportsMatch(UnHealthyContainerStates state) { List rmContainerIDs = rmReport.getSample(rmState); List rmIDsToLong = new ArrayList<>(); for (ContainerID id : rmContainerIDs) { - rmIDsToLong.add(id.getId()); + rmIDsToLong.add(id.getIdForTesting()); } List reconContainerIDs = reconResponse.getContainers() diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java index 2370c475a7ee..a70333d4b217 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/storage/TestContainerCommandsEC.java @@ -1036,7 +1036,7 @@ public static void prepareData(int[][] ranges) throws Exception { .map(ContainerInfo::containerID) .collect(Collectors.toList()); assertEquals(1, containerIDs.size()); - containerID = containerIDs.get(0).getId(); + containerID = containerIDs.get(0).getIdForTesting(); List pipelines = scm.getPipelineManager().getPipelines(repConfig); assertEquals(1, pipelines.size()); pipeline = pipelines.get(0); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java index baad632e4233..415b991e5b81 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java @@ -154,7 +154,7 @@ void testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReported() throws Except assertThat(keyLocations).isNotEmpty(); OmKeyLocationInfo keyLocation = keyLocations.get(0); ContainerID containerID = ContainerID.valueOf(keyLocation.getContainerID()); - waitForContainerClose(cluster, containerID.getId()); + waitForContainerClose(cluster, containerID.getIdForTesting()); // also wait till the container is closed in SCM waitForContainerClosedInSCM(containerID); diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java index 3186e35c9401..3c561c93f9ea 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestBlockDeletion.java @@ -508,14 +508,14 @@ public void testContainerStateAfterDNRestart() throws Exception { containerInfos.get(0).getContainerID()); // Before restart container state is non-empty assertFalse(getContainerFromDN( - cluster.getHddsDatanodes().get(0), containerId.getId()) + cluster.getHddsDatanodes().get(0), containerId.getIdForTesting()) .getContainerData().isEmpty()); // Restart DataNode cluster.restartHddsDatanode(0, true); // After restart also container state remains non-empty. assertFalse(getContainerFromDN( - cluster.getHddsDatanodes().get(0), containerId.getId()) + cluster.getHddsDatanodes().get(0), containerId.getIdForTesting()) .getContainerData().isEmpty()); // Delete key @@ -535,14 +535,14 @@ public void testContainerStateAfterDNRestart() throws Exception { // Container state should be empty now as key got deleted assertTrue(getContainerFromDN( - cluster.getHddsDatanodes().get(0), containerId.getId()) + cluster.getHddsDatanodes().get(0), containerId.getIdForTesting()) .getContainerData().isEmpty()); // Restart DataNode cluster.restartHddsDatanode(0, true); // Container state should be empty even after restart assertTrue(getContainerFromDN( - cluster.getHddsDatanodes().get(0), containerId.getId()) + cluster.getHddsDatanodes().get(0), containerId.getIdForTesting()) .getContainerData().isEmpty()); GenericTestUtils.waitFor(() -> { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java index 2942f840e0d1..0f11f72e5b1d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerHandler.java @@ -113,25 +113,25 @@ public void test() throws Exception { Pipeline pipeline = cluster.getStorageContainerManager() .getPipelineManager().getPipeline(container.getPipelineID()); - assertFalse(isContainerClosed(cluster, containerId.getId())); + assertFalse(isContainerClosed(cluster, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = cluster.getHddsDatanodes().get(0).getDatanodeDetails(); //send the order to close the container SCMCommand command = new CloseContainerCommand( - containerId.getId(), pipeline.getId()); + containerId.getIdForTesting(), pipeline.getId()); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); cluster.getStorageContainerManager().getScmNodeManager() .addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerClosed(cluster, containerId.getId()), + isContainerClosed(cluster, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - assertTrue(isContainerClosed(cluster, containerId.getId())); + assertTrue(isContainerClosed(cluster, containerId.getIdForTesting())); } private static Boolean isContainerClosed(MiniOzoneCluster cluster, diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java index d299503c1327..cf41bddfcd0d 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestDeleteContainerHandler.java @@ -164,12 +164,12 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); KeyValueContainer kv = (KeyValueContainer) getContainerfromDN( - hddsDatanodeService, containerId.getId()); + hddsDatanodeService, containerId.getIdForTesting()); kv.setCheckChunksFilePath(true); NodeManager nodeManager = @@ -183,11 +183,11 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() .getDatanodeStateMachine().getContainer().getMetrics(); long beforeDeleteFailedCount = metrics.getContainerDeleteFailedNonEmpty(); GenericTestUtils.waitFor(() -> - isContainerClosed(hddsDatanodeService, containerId.getId()), + isContainerClosed(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); // Delete key, which will make isEmpty flag to true in containerData objectStore.getVolume(volumeName) @@ -197,7 +197,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() // Ensure isEmpty flag is true when key is deleted and container is empty GenericTestUtils.waitFor(() -> getContainerfromDN( - hddsDatanodeService, containerId.getId()) + hddsDatanodeService, containerId.getIdForTesting()) .getContainerData().isEmpty(), 500, 5 * 2000); @@ -205,7 +205,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() Container containerInternalObj = hddsDatanodeService. getDatanodeStateMachine(). - getContainer().getContainerSet().getContainer(containerId.getId()); + getContainer().getContainerSet().getContainer(containerId.getIdForTesting()); // Write a file to the container chunks directory indicating that there // might be a discrepancy between block count as recorded in RocksDB and @@ -216,14 +216,14 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() FileUtils.touch(lingeringBlock); // Check container exists before sending delete container command - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); // Set container blockCount to 0 to mock that it is empty as per RocksDB - getContainerfromDN(hddsDatanodeService, containerId.getId()) + getContainerfromDN(hddsDatanodeService, containerId.getIdForTesting()) .getContainerData().getStatistics().setBlockCountForTesting(0); // send delete container to the datanode - SCMCommand command = new DeleteContainerCommand(containerId.getId(), + SCMCommand command = new DeleteContainerCommand(containerId.getIdForTesting(), false); // Send the delete command. It should fail as even though block count @@ -240,22 +240,22 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckTrue() 500, 5 * 2000); - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); assertThat(beforeDeleteFailedCount).isLessThan(metrics.getContainerDeleteFailedNonEmpty()); // Send the delete command. It should pass with force flag. // Deleting a non-empty container should pass on the DN when the force flag // is true long beforeForceCount = metrics.getContainerForceDelete(); - command = new DeleteContainerCommand(containerId.getId(), true); + command = new DeleteContainerCommand(containerId.getIdForTesting(), true); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); - assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); assertThat(beforeForceCount).isLessThan(metrics.getContainerForceDelete()); kv.setCheckChunksFilePath(false); @@ -290,7 +290,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -301,11 +301,11 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() .getEventQueue(), cluster.getStorageContainerManager()); GenericTestUtils.waitFor(() -> - isContainerClosed(hddsDatanodeService, containerId.getId()), + isContainerClosed(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); // Delete key, which will make isEmpty flag to true in containerData objectStore.getVolume(volumeName) @@ -315,7 +315,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() // Ensure isEmpty flag is true when key is deleted and container is empty GenericTestUtils.waitFor(() -> getContainerfromDN( - hddsDatanodeService, containerId.getId()) + hddsDatanodeService, containerId.getIdForTesting()) .getContainerData().isEmpty(), 500, 5 * 2000); @@ -323,7 +323,7 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() Container containerInternalObj = hddsDatanodeService. getDatanodeStateMachine(). - getContainer().getContainerSet().getContainer(containerId.getId()); + getContainer().getContainerSet().getContainer(containerId.getIdForTesting()); // Write a file to the container chunks directory indicating that there // might be a discrepancy between block count as recorded in RocksDB and @@ -334,10 +334,10 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() FileUtils.touch(lingeringBlock); // Check container exists before sending delete container command - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); // send delete container to the datanode - SCMCommand command = new DeleteContainerCommand(containerId.getId(), + SCMCommand command = new DeleteContainerCommand(containerId.getIdForTesting(), false); // Send the delete command. It should succeed as even though @@ -347,9 +347,9 @@ public void testDeleteNonEmptyContainerOnDirEmptyCheckFalse() nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); - assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); } @Test @@ -375,7 +375,7 @@ public void testDeleteNonEmptyContainerBlockTable() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -383,7 +383,7 @@ public void testDeleteNonEmptyContainerBlockTable() cluster.getStorageContainerManager().getScmNodeManager(); //send the order to close the container SCMCommand command = new CloseContainerCommand( - containerId.getId(), pipeline.getId()); + containerId.getIdForTesting(), pipeline.getId()); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); @@ -391,7 +391,7 @@ public void testDeleteNonEmptyContainerBlockTable() Container containerInternalObj = hddsDatanodeService. getDatanodeStateMachine(). - getContainer().getContainerSet().getContainer(containerId.getId()); + getContainer().getContainerSet().getContainer(containerId.getIdForTesting()); // Write a file to the container chunks directory indicating that there // might be a discrepancy between block count as recorded in RocksDB and @@ -404,21 +404,21 @@ public void testDeleteNonEmptyContainerBlockTable() hddsDatanodeService .getDatanodeStateMachine().getContainer().getMetrics(); GenericTestUtils.waitFor(() -> - isContainerClosed(hddsDatanodeService, containerId.getId()), + isContainerClosed(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) assertTrue(isContainerClosed(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); // Check container exists before sending delete container command assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); long containerDeleteFailedNonEmptyBlockDB = metrics.getContainerDeleteFailedNonEmpty(); // send delete container to the datanode - command = new DeleteContainerCommand(containerId.getId(), false); + command = new DeleteContainerCommand(containerId.getIdForTesting(), false); // Send the delete command. It should fail as even though isEmpty // flag is true, there is a lingering block on disk. @@ -434,13 +434,13 @@ public void testDeleteNonEmptyContainerBlockTable() 500, 5 * 2000); - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); assertThat(containerDeleteFailedNonEmptyBlockDB) .isLessThan(metrics.getContainerDeleteFailedNonEmpty()); // Now empty the container Dir and try with a non-empty block table Container containerToDelete = getContainerfromDN( - hddsDatanodeService, containerId.getId()); + hddsDatanodeService, containerId.getIdForTesting()); File chunkDir = new File(containerToDelete. getContainerData().getChunksPath()); File[] files = chunkDir.listFiles(); @@ -450,27 +450,27 @@ public void testDeleteNonEmptyContainerBlockTable() } } - command = new DeleteContainerCommand(containerId.getId(), false); + command = new DeleteContainerCommand(containerId.getIdForTesting(), false); // Send the delete command.It should fail as still block table is non-empty command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); Thread.sleep(5000); - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); // Send the delete command. It should pass with force flag. long beforeForceCount = metrics.getContainerForceDelete(); - command = new DeleteContainerCommand(containerId.getId(), true); + command = new DeleteContainerCommand(containerId.getIdForTesting(), true); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); assertThat(beforeForceCount).isLessThan(metrics.getContainerForceDelete()); } @@ -492,36 +492,36 @@ public void testContainerDeleteWithInvalidBlockCount() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); NodeManager nodeManager = cluster.getStorageContainerManager().getScmNodeManager(); //send the order to close the container SCMCommand command = new CloseContainerCommand( - containerId.getId(), pipeline.getId()); + containerId.getIdForTesting(), pipeline.getId()); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerClosed(hddsDatanodeService, containerId.getId()), + isContainerClosed(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); // Check container exists before sending delete container command - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); // Clear block table clearBlocksTable(getContainerfromDN(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); // Now empty the container Dir Container containerToDelete = getContainerfromDN( - hddsDatanodeService, containerId.getId()); + hddsDatanodeService, containerId.getIdForTesting()); File chunkDir = new File(containerToDelete. getContainerData().getChunksPath()); File[] files = chunkDir.listFiles(); @@ -532,7 +532,7 @@ public void testContainerDeleteWithInvalidBlockCount() } // send delete container to the datanode, blockCount is still 1(Invalid) - command = new DeleteContainerCommand(containerId.getId(), false); + command = new DeleteContainerCommand(containerId.getIdForTesting(), false); // Send the delete command. It should succeed as even though blockCount // is non-zero(Invalid). @@ -541,9 +541,9 @@ public void testContainerDeleteWithInvalidBlockCount() nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); - assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); } @@ -601,7 +601,7 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() HddsDatanodeService hddsDatanodeService = cluster.getHddsDatanodes().get(0); - assertFalse(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); DatanodeDetails datanodeDetails = hddsDatanodeService.getDatanodeDetails(); @@ -614,17 +614,17 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() .getEventQueue(), cluster.getStorageContainerManager()); GenericTestUtils.waitFor(() -> - isContainerClosed(hddsDatanodeService, containerId.getId()), + isContainerClosed(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); //double check if it's really closed (waitFor also throws an exception) - assertTrue(isContainerClosed(hddsDatanodeService, containerId.getId())); + assertTrue(isContainerClosed(hddsDatanodeService, containerId.getIdForTesting())); // Check container exists before sending delete container command - assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getId())); + assertFalse(isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())); // send delete container to the datanode - SCMCommand command = new DeleteContainerCommand(containerId.getId(), + SCMCommand command = new DeleteContainerCommand(containerId.getIdForTesting(), false); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); @@ -650,7 +650,7 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() // Ensure isEmpty flag is true when key is deleted GenericTestUtils.waitFor(() -> getContainerfromDN( - hddsDatanodeService, containerId.getId()) + hddsDatanodeService, containerId.getIdForTesting()) .getContainerData().isEmpty(), 500, 5 * 2000); @@ -660,11 +660,11 @@ public void testDeleteContainerRequestHandlerOnClosedContainer() nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); } @Test @@ -690,7 +690,7 @@ public void testDeleteContainerRequestHandlerOnOpenContainer() // Send delete container command with force flag set to false. SCMCommand command = new DeleteContainerCommand( - containerId.getId(), false); + containerId.getIdForTesting(), false); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); @@ -700,7 +700,7 @@ public void testDeleteContainerRequestHandlerOnOpenContainer() int count = 1; // Checking for 5 seconds, whether it is containerSet, as after command // is issued, giving some time for it to process. - while (!isContainerDeleted(hddsDatanodeService, containerId.getId())) { + while (!isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting())) { Thread.sleep(1000); count++; if (count == 5) { @@ -709,22 +709,22 @@ public void testDeleteContainerRequestHandlerOnOpenContainer() } assertFalse(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); // Now delete container with force flag set to true. now it should delete // container - command = new DeleteContainerCommand(containerId.getId(), true); + command = new DeleteContainerCommand(containerId.getIdForTesting(), true); command.setTerm( cluster.getStorageContainerManager().getScmContext().getTermOfLeader()); nodeManager.addDatanodeCommand(datanodeDetails.getID(), command); GenericTestUtils.waitFor(() -> - isContainerDeleted(hddsDatanodeService, containerId.getId()), + isContainerDeleted(hddsDatanodeService, containerId.getIdForTesting()), 500, 5 * 1000); assertTrue(isContainerDeleted(hddsDatanodeService, - containerId.getId())); + containerId.getIdForTesting())); } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestFinalizeBlock.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestFinalizeBlock.java index 3e1711119eaa..6eb50bdfc453 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestFinalizeBlock.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestFinalizeBlock.java @@ -159,7 +159,7 @@ public void testFinalizeBlock(boolean enableSchemaV3) throws Exception { // Before finalize block WRITE chunk on the same block should pass through ContainerProtos.ContainerCommandRequestProto request = ContainerTestHelper.getWriteChunkRequest(pipeline, ( - new BlockID(containerId.getId(), omKeyLocationInfoGroupList.get(0) + new BlockID(containerId.getIdForTesting(), omKeyLocationInfoGroupList.get(0) .getLocationList().get(0).getLocalID())), 100); xceiverClient.sendCommand(request); @@ -176,7 +176,7 @@ public void testFinalizeBlock(boolean enableSchemaV3) throws Exception { omKeyLocationInfoGroupList.get(0).getLocationList().get(0).getLocalID()); assertEquals(1, ((KeyValueContainerData)getContainerfromDN(cluster.getHddsDatanodes().get(0), - containerId.getId()).getContainerData()).getFinalizedBlockSet().size()); + containerId.getIdForTesting()).getContainerData()).getFinalizedBlockSet().size()); testRejectPutAndWriteChunkAfterFinalizeBlock(containerId, pipeline, xceiverClient, omKeyLocationInfoGroupList); testFinalizeBlockReloadAfterDNRestart(containerId); @@ -192,7 +192,7 @@ private void testFinalizeBlockReloadAfterDNRestart(ContainerID containerId) { // After restart DN, finalizeBlock should be loaded into memory assertEquals(1, ((KeyValueContainerData)getContainerfromDN(cluster.getHddsDatanodes().get(0), - containerId.getId()).getContainerData()).getFinalizedBlockSet().size()); + containerId.getIdForTesting()).getContainerData()).getFinalizedBlockSet().size()); } private void testFinalizeBlockClearAfterCloseContainer(ContainerID containerId) @@ -203,7 +203,7 @@ private void testFinalizeBlockClearAfterCloseContainer(ContainerID containerId) // Finalize Block should be cleared from container data. GenericTestUtils.waitFor(() -> ( (KeyValueContainerData)getContainerfromDN(cluster.getHddsDatanodes().get(0), - containerId.getId()).getContainerData()).getFinalizedBlockSet().isEmpty(), + containerId.getIdForTesting()).getContainerData()).getFinalizedBlockSet().isEmpty(), 100, 10 * 1000); try { // Restart DataNode @@ -215,7 +215,7 @@ private void testFinalizeBlockClearAfterCloseContainer(ContainerID containerId) // After DN restart also there should not be any finalizeBlock assertTrue(((KeyValueContainerData)getContainerfromDN( cluster.getHddsDatanodes().get(0), - containerId.getId()).getContainerData()) + containerId.getIdForTesting()).getContainerData()) .getFinalizedBlockSet().isEmpty()); } @@ -225,7 +225,7 @@ private void testRejectPutAndWriteChunkAfterFinalizeBlock(ContainerID containerI // Try doing WRITE chunk on the already finalized block ContainerProtos.ContainerCommandRequestProto request = ContainerTestHelper.getWriteChunkRequest(pipeline, - (new BlockID(containerId.getId(), omKeyLocationInfoGroupList.get(0) + (new BlockID(containerId.getIdForTesting(), omKeyLocationInfoGroupList.get(0) .getLocationList().get(0).getLocalID())), 100); try { diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java index c2edd87a2b57..729cdadc76de 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestSecureOzoneContainer.java @@ -165,7 +165,7 @@ void testCreateOzoneContainer(boolean requireToken, boolean hasToken, } ContainerCommandRequestProto request = - getCreateContainerSecureRequest(containerID.getId(), + getCreateContainerSecureRequest(containerID.getIdForTesting(), client.getPipeline(), token); ContainerCommandResponseProto response = client.sendCommand(request); assertNotNull(response); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java index f46c5345cfe0..b73d7a0b3678 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestBlocksEndPoint.java @@ -268,7 +268,7 @@ protected ContainerWithPipeline getTestContainer( reconPipelineManager.addPipeline(localPipeline); ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(localContainerID.getId()) + .setContainerID(localContainerID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(localPipeline.getId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java index 9855d0c37bc0..505f22c7c8e5 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/api/TestContainerEndpoint.java @@ -798,7 +798,7 @@ public void testGetMissingContainers() throws IOException, TimeoutException { responseObject.getContainers().stream().findFirst().orElse(null); assertNotNull(container); - assertEquals(containerID.getId(), container.getContainerID()); + assertEquals(containerID.getIdForTesting(), container.getContainerID()); assertEquals(keyCount, container.getKeys()); assertEquals(pipelineID.getId(), container.getPipelineID()); assertEquals(3, container.getReplicas().size()); @@ -1185,7 +1185,7 @@ protected ContainerWithPipeline getTestContainer( reconPipelineManager.addPipeline(localPipeline); ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(localContainerID.getId()) + .setContainerID(localContainerID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(localPipeline.getId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java index 81b52a6e5d21..092897848867 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/AbstractReconContainerManagerTest.java @@ -145,7 +145,7 @@ private StorageContainerServiceProvider getScmServiceProvider() ContainerID containerID = ContainerID.valueOf(100L); ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(pipeline.getId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) @@ -189,7 +189,7 @@ private StorageContainerServiceProvider getScmServiceProvider() ContainerID cID = ContainerID.valueOf(i); ContainerInfo cInfo = new ContainerInfo.Builder() - .setContainerID(cID.getId()) + .setContainerID(cID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(pipeline.getId()) .setReplicationConfig( @@ -228,7 +228,7 @@ protected ContainerWithPipeline getTestContainer(LifeCycleState state) pipelineManager.addPipeline(pipeline); ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(pipeline.getId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) @@ -246,7 +246,7 @@ protected ContainerWithPipeline getTestContainer(long id, pipelineManager.addPipeline(pipeline); ContainerInfo containerInfo = new ContainerInfo.Builder() - .setContainerID(containerID.getId()) + .setContainerID(containerID.getIdForTesting()) .setNumberOfKeys(10) .setPipelineID(pipeline.getId()) .setReplicationConfig(StandaloneReplicationConfig.getInstance(ONE)) diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java index 8eade310b9b9..89ad99d77a31 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconContainerManager.java @@ -205,7 +205,7 @@ public void testOpenContainerTransitionsToClosingWithoutScmLookup() assertFalse(getContainerManager().getPipelineToOpenContainer() .containsKey(openContainer.getPipeline().getId())); verify(getContainerManager().getScmClient(), never()) - .getContainerWithPipeline(containerID.getId()); + .getContainerWithPipeline(containerID.getIdForTesting()); } @Test @@ -275,7 +275,7 @@ public void testOtherReconStatesDoNotInferDnReplicaTransition() assertEquals(CLOSED, getContainerManager().getContainer(containerID).getState()); verify(getContainerManager().getScmClient(), never()) - .getContainerWithPipeline(containerID.getId()); + .getContainerWithPipeline(containerID.getIdForTesting()); } ContainerInfo newContainerInfo(long containerId, Pipeline pipeline) { diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java index 7d6a217c0f8f..6ff80e77a950 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconIncrementalContainerReportHandler.java @@ -79,7 +79,7 @@ public void testProcessICR(@TempDir Path scmPath) when(reportMock.getDatanodeDetails()).thenReturn(datanodeDetails); ContainerWithPipeline containerWithPipeline = getTestContainer( - containerID.getId(), OPEN); + containerID.getIdForTesting(), OPEN); List containerWithPipelineList = new ArrayList<>(); containerWithPipelineList.add(containerWithPipeline); ReconContainerManager containerManager = getContainerManager(); @@ -167,7 +167,7 @@ public void testProcessICRStateMismatch() String.format("Expecting %s in container state for replica state %s", expectedState, state)); verify(containerManager.getScmClient(), never()) - .getContainerWithPipeline(containerID.getId()); + .getContainerWithPipeline(containerID.getIdForTesting()); } } @@ -200,7 +200,7 @@ public void testClosingContainerAdvancesViaScmHandlerWithoutScmLookup() String.format("Expecting %s in container state for replica state %s", expectedState, state)); verify(containerManager.getScmClient(), never()) - .getContainerWithPipeline(containerID.getId()); + .getContainerWithPipeline(containerID.getIdForTesting()); } } @@ -269,7 +269,7 @@ private static IncrementalContainerReportFromDatanode getReportMock( IncrementalContainerReportProto.newBuilder(); final ContainerReplicaProto replicaProto = ContainerReplicaProto.newBuilder() - .setContainerID(containerId.getId()) + .setContainerID(containerId.getIdForTesting()) .setState(state) .setOriginNodeId(originNodeId) .build(); diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconSCMContainerSyncIntegration.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconSCMContainerSyncIntegration.java index 0d7147c7e8a0..004480aa5562 100644 --- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconSCMContainerSyncIntegration.java +++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/scm/TestReconSCMContainerSyncIntegration.java @@ -1106,7 +1106,7 @@ void allStateTransitionPathsEndToEnd() throws Exception { any(ContainerID.class), eq(1), eq(DELETED))) .thenAnswer(inv -> { ContainerID id = inv.getArgument(0); - return Collections.singletonList(containerInfo(id.getId(), DELETED)); + return Collections.singletonList(containerInfo(id.getIdForTesting(), DELETED)); }); assertTrue(syncHelper.syncWithSCMContainerInfo());