diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconOmMetaManagerUtils.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconOmMetaManagerTestUtils.java similarity index 91% rename from hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconOmMetaManagerUtils.java rename to hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconOmMetaManagerTestUtils.java index 8aa32ac40baa..fa4ad6642aa4 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconOmMetaManagerUtils.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/ReconOmMetaManagerTestUtils.java @@ -25,9 +25,12 @@ import org.apache.ozone.test.GenericTestUtils; /** - * Test Recon Utility methods. + * Utility methods for Recon OM metadata manager integration tests. */ -public class TestReconOmMetaManagerUtils { +final class ReconOmMetaManagerTestUtils { + + private ReconOmMetaManagerTestUtils() { + } /** * Wait for all currently buffered events to be processed asynchronously. @@ -36,7 +39,7 @@ public class TestReconOmMetaManagerUtils { * * @return CompletableFuture that completes when buffer is empty */ - public CompletableFuture waitForEventBufferEmpty(OMUpdateEventBuffer eventBuffer) { + static CompletableFuture waitForEventBufferEmpty(OMUpdateEventBuffer eventBuffer) { return CompletableFuture.runAsync(() -> { try { GenericTestUtils.waitFor(() -> eventBuffer.getQueueSize() == 0, 100, 30000); @@ -60,7 +63,7 @@ public CompletableFuture waitForEventBufferEmpty(OMUpdateEventBuffer event * @param minimumCountPerContainer map of container ID to minimum inclusive key count * @throws Exception if the condition is not met within the timeout or on interrupt */ - public static void waitUntilReconKeyCounts(ReconContainerMetadataManager mgr, + static void waitUntilReconKeyCounts(ReconContainerMetadataManager mgr, Map minimumCountPerContainer) throws Exception { GenericTestUtils.waitFor(() -> { try { diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java index a9fcbd2689fa..b66e20628f04 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java @@ -17,6 +17,8 @@ package org.apache.hadoop.ozone.recon; +import static org.apache.hadoop.ozone.recon.ReconOmMetaManagerTestUtils.waitForEventBufferEmpty; +import static org.apache.hadoop.ozone.recon.ReconOmMetaManagerTestUtils.waitUntilReconKeyCounts; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -63,7 +65,6 @@ public class TestReconContainerEndpoint { private OzoneClient client; private ObjectStore store; private ReconService recon; - private TestReconOmMetaManagerUtils omMetaManagerUtils = new TestReconOmMetaManagerUtils(); @BeforeEach public void init() throws Exception { @@ -121,7 +122,7 @@ public void testContainerEndpointForFSOLayout() throws Exception { ReconTaskControllerImpl reconTaskController = (ReconTaskControllerImpl) recon.getReconServer().getReconTaskController(); CompletableFuture completableFuture = - omMetaManagerUtils.waitForEventBufferEmpty(reconTaskController.getEventBuffer()); + waitForEventBufferEmpty(reconTaskController.getEventBuffer()); GenericTestUtils.waitFor(completableFuture::isDone, 100, 30000); completableFuture.join(); waitUntilReconIndexesKeysForPaths(volName, bucketName, @@ -192,7 +193,7 @@ public void testContainerEndpointForOBSBucket() throws Exception { ReconTaskControllerImpl reconTaskController = (ReconTaskControllerImpl) recon.getReconServer().getReconTaskController(); CompletableFuture completableFuture = - omMetaManagerUtils.waitForEventBufferEmpty(reconTaskController.getEventBuffer()); + waitForEventBufferEmpty(reconTaskController.getEventBuffer()); GenericTestUtils.waitFor(completableFuture::isDone, 100, 30000); completableFuture.join(); waitUntilReconIndexesKeysForPaths(volumeName, obsBucketName, obsSingleFileKey); @@ -252,7 +253,7 @@ private void waitUntilReconIndexesKeysForPaths(String volumeName, } ReconContainerMetadataManager mgr = recon.getReconServer().getReconContainerMetadataManager(); - TestReconOmMetaManagerUtils.waitUntilReconKeyCounts(mgr, requiredCountByContainer); + waitUntilReconKeyCounts(mgr, requiredCountByContainer); } private long getContainerIdForKey(String volumeName, String bucketName, diff --git a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java index 98332da82601..6533f482c8f7 100644 --- a/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java +++ b/hadoop-ozone/integration-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconWithOzoneManagerHA.java @@ -19,6 +19,8 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.hadoop.ozone.OzoneConsts.OZONE_DB_CHECKPOINT_HTTP_ENDPOINT; +import static org.apache.hadoop.ozone.recon.ReconOmMetaManagerTestUtils.waitForEventBufferEmpty; +import static org.apache.hadoop.ozone.recon.ReconOmMetaManagerTestUtils.waitUntilReconKeyCounts; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -66,7 +68,6 @@ public class TestReconWithOzoneManagerHA { private static final String VOL_NAME = "testrecon"; private OzoneClient client; private ReconService recon; - private TestReconOmMetaManagerUtils omMetaManagerUtils = new TestReconOmMetaManagerUtils(); @BeforeEach public void setup() throws Exception { @@ -144,7 +145,7 @@ public void testReconGetsSnapshotFromLeader() throws Exception { ReconTaskControllerImpl reconTaskController = (ReconTaskControllerImpl) recon.getReconServer().getReconTaskController(); CompletableFuture completableFuture = - omMetaManagerUtils.waitForEventBufferEmpty(reconTaskController.getEventBuffer()); + waitForEventBufferEmpty(reconTaskController.getEventBuffer()); GenericTestUtils.waitFor(completableFuture::isDone, 100, 30000); final ReconContainerMetadataManagerImpl reconContainerMetadataManager = @@ -152,7 +153,7 @@ public void testReconGetsSnapshotFromLeader() throws Exception { long containerId = getContainerIdForKey(ozoneManager.get(), VOL_NAME, VOL_NAME, keyPrefix); Map requiredKeyCountByContainer = Collections.singletonMap(containerId, 1); - TestReconOmMetaManagerUtils.waitUntilReconKeyCounts(reconContainerMetadataManager, + waitUntilReconKeyCounts(reconContainerMetadataManager, requiredKeyCountByContainer); try (Table.KeyValueIterator iterator = reconContainerMetadataManager.getContainerKeyTableForTesting().iterator()) {