This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 2cece19f35b HDDS-15200. Rename TestReconOmMetaManagerUtils to
ReconOmMetaManagerTestUtils (#10480)
2cece19f35b is described below
commit 2cece19f35bf70c77f1af84c2cbb1f8db3989fe5
Author: Arun Sarin <[email protected]>
AuthorDate: Thu Jun 18 16:06:25 2026 +0530
HDDS-15200. Rename TestReconOmMetaManagerUtils to
ReconOmMetaManagerTestUtils (#10480)
---
...MetaManagerUtils.java => ReconOmMetaManagerTestUtils.java} | 11 +++++++----
.../apache/hadoop/ozone/recon/TestReconContainerEndpoint.java | 9 +++++----
.../hadoop/ozone/recon/TestReconWithOzoneManagerHA.java | 7 ++++---
3 files changed, 16 insertions(+), 11 deletions(-)
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 8aa32ac40ba..fa4ad6642aa 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<Void> waitForEventBufferEmpty(OMUpdateEventBuffer
eventBuffer) {
+ static CompletableFuture<Void> waitForEventBufferEmpty(OMUpdateEventBuffer
eventBuffer) {
return CompletableFuture.runAsync(() -> {
try {
GenericTestUtils.waitFor(() -> eventBuffer.getQueueSize() == 0, 100,
30000);
@@ -60,7 +63,7 @@ public CompletableFuture<Void>
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<Long, Integer> 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 a9fcbd2689f..b66e20628f0 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<Void> 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<Void> 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 98332da8260..6533f482c8f 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<Void> 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<Long, Integer> requiredKeyCountByContainer =
Collections.singletonMap(containerId, 1);
-
TestReconOmMetaManagerUtils.waitUntilReconKeyCounts(reconContainerMetadataManager,
+ waitUntilReconKeyCounts(reconContainerMetadataManager,
requiredKeyCountByContainer);
try (Table.KeyValueIterator<ContainerKeyPrefix, Integer> iterator
=
reconContainerMetadataManager.getContainerKeyTableForTesting().iterator()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
