Skip to content

HDDS-15004. Stabilize TestReconContainerEndpoint#testContainerEndpointForOBSBucket #10116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
May 7, 2026
Merged

HDDS-15004. Stabilize TestReconContainerEndpoint#testContainerEndpointForOBSBucket #10116

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cd41bb
HDDS-15004. Stabilize TestReconContainerEndpoint#testContainerEndpoin…
arunsarin85 Apr 23, 2026
5424549
HDDS-15004. Addressed review comments
arunsarin85 Apr 29, 2026
67cea40
HDDS-15004. Addressed review comments
arunsarin85 Apr 29, 2026
4448871
HDDS-15004. Addressed review comments
arunsarin85 May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions ...on-test-recon/src/test/java/org/apache/hadoop/ozone/recon/TestReconContainerEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,14 @@
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.recon.api.ContainerEndpoint;
import org.apache.hadoop.ozone.recon.api.types.KeyMetadata;
import org.apache.hadoop.ozone.recon.api.types.KeysResponse;
import org.apache.hadoop.ozone.recon.recovery.ReconOMMetadataManager;
import org.apache.hadoop.ozone.recon.spi.impl.OzoneManagerServiceProviderImpl;
import org.apache.hadoop.ozone.recon.tasks.ContainerKeyMapperHelper;
import org.apache.hadoop.ozone.recon.tasks.ReconTaskControllerImpl;
import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterEach;
Expand All @@ -60,6 +63,9 @@ public class TestReconContainerEndpoint {

@BeforeEach
public void init() throws Exception {
// ContainerKeyMapper tasks share static maps/flags across the JVM; reset so a
// prior test method cannot break mapper state for this cluster instance.
ContainerKeyMapperHelper.clearSharedContainerCountMap();
OzoneConfiguration conf = new OzoneConfiguration();
conf.set(OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT,
OMConfigKeys.OZONE_BUCKET_LAYOUT_FILE_SYSTEM_OPTIMIZED);
Expand All @@ -77,11 +83,15 @@ public void init() throws Exception {

@AfterEach
public void shutdown() throws IOException {
if (client != null) {
client.close();
}
if (cluster != null) {
cluster.shutdown();
try {
if (client != null) {
client.close();
}
if (cluster != null) {
cluster.shutdown();
}
} finally {
ContainerKeyMapperHelper.clearSharedContainerCountMap();
Comment thread
arunsarin85 marked this conversation as resolved.
Outdated
}
}

Expand Down Expand Up @@ -117,6 +127,9 @@ public void testContainerEndpointForFSOLayout() throws Exception {
CompletableFuture<Void> completableFuture =
omMetaManagerUtils.waitForEventBufferEmpty(reconTaskController.getEventBuffer());
GenericTestUtils.waitFor(completableFuture::isDone, 100, 30000);
completableFuture.join();
// The buffer can be empty while tasks still finish processing a dequeued batch.
Thread.sleep(2000);
Comment thread
arunsarin85 marked this conversation as resolved.
Outdated

//Search for the bucket from the bucket table and verify its FSO
OmBucketInfo bucketInfo = cluster.getOzoneManager().getBucketInfo(volName, bucketName);
Expand Down Expand Up @@ -186,14 +199,17 @@ public void testContainerEndpointForOBSBucket() throws Exception {
CompletableFuture<Void> completableFuture =
omMetaManagerUtils.waitForEventBufferEmpty(reconTaskController.getEventBuffer());
GenericTestUtils.waitFor(completableFuture::isDone, 100, 30000);
completableFuture.join();
Thread.sleep(2000);

// Search for the bucket from the bucket table and verify its OBS
OmBucketInfo bucketInfo = cluster.getOzoneManager().getBucketInfo(volumeName, obsBucketName);
assertNotNull(bucketInfo);
assertEquals(BucketLayout.OBJECT_STORE, bucketInfo.getBucketLayout());

// Initialize the ContainerEndpoint
long containerId = 1L;
long containerId = getContainerIdForKey(volumeName, obsBucketName,
obsSingleFileKey);

Response response = getContainerEndpointResponse(containerId);

assertNotNull(response, "Response should not be null.");
Expand Down Expand Up @@ -226,6 +242,22 @@ private Response getContainerEndpointResponse(long containerId) {
return containerEndpoint.getKeysForContainer(containerId, 10, "");
}

private long getContainerIdForKey(String volumeName, String bucketName,
String keyName) throws IOException {
OmKeyArgs keyArgs = new OmKeyArgs.Builder()
.setVolumeName(volumeName)
.setBucketName(bucketName)
.setKeyName(keyName)
.build();
OmKeyLocationInfo location = cluster.getOzoneManager()
.lookupKey(keyArgs)
.getKeyLocationVersions()
.get(0)
.getBlocksLatestVersionOnly()
.get(0);
return location.getContainerID();
}

private void writeTestData(String volumeName, String bucketName,
String keyPath, String data) throws Exception {
try (OzoneOutputStream out = client.getObjectStore().getVolume(volumeName)
Expand Down