Skip to content

HDDS-15265. Speed up TestStorageDistributionEndpoint testcases #10417

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 1 commit into from
Jun 3, 2026
Merged

HDDS-15265. Speed up TestStorageDistributionEndpoint testcases #10417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...in/java/org/apache/hadoop/ozone/container/common/helpers/BlockDeletingServiceMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public final class BlockDeletingServiceMetrics {
private BlockDeletingServiceMetrics() {
}

public static BlockDeletingServiceMetrics create() {
public static synchronized BlockDeletingServiceMetrics create() {
if (instance == null) {
MetricsSystem ms = DefaultMetricsSystem.instance();
instance = ms.register(SOURCE_NAME, "BlockDeletingService",
Expand All @@ -100,7 +100,7 @@ public static BlockDeletingServiceMetrics create() {
/**
* Unregister the metrics instance.
*/
public static void unRegister() {
public static synchronized void unRegister() {
instance = null;
MetricsSystem ms = DefaultMetricsSystem.instance();
ms.unregisterSource(SOURCE_NAME);
Expand Down
3 changes: 2 additions & 1 deletion .../src/test/java/org/apache/hadoop/ozone/recon/AbstractTestStorageDistributionEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ protected static void initializeCluster(int numDatanodes) throws Exception {
conf.set(HDDS_SCM_WAIT_TIME_AFTER_SAFE_MODE_EXIT, "0s");

DatanodeConfiguration dnConf = conf.getObject(DatanodeConfiguration.class);
dnConf.setBlockDeletionInterval(Duration.ofMillis(30000));
dnConf.setBlockDeletionInterval(Duration.ofMillis(5000));
conf.setFromObject(dnConf);

recon = new ReconService(conf);
Expand Down Expand Up @@ -212,6 +212,7 @@ protected void createOpenKeysAndMultipartKeys(String volumeName,

protected boolean verifyStorageDistributionAfterKeyCreation() {
try {
syncDataFromOM();
StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(getReconWebAddress(conf)).append(STORAGE_DIST_ENDPOINT);
String response = TestReconEndpointUtil.makeHttpCall(conf, urlBuilder);
Expand Down
6 changes: 3 additions & 3 deletions ...-recon/src/test/java/org/apache/hadoop/ozone/recon/TestStorageDistributionEndpointEC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ public void testStorageDistributionEndpoint() throws Exception {
closeAllContainers();
getFs().delete(dir1, true);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionOm, 1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionScm, 2000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionScm, 1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionDn, 1000, 60000);
GenericTestUtils.waitFor(() -> Objects.requireNonNull(
getScm().getClientProtocolServer().getDeletedBlockSummary()).getTotalBlockCount() == 0,
1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionDn, 2000, 60000);
GenericTestUtils.waitFor(this::verifyPendingDeletionClearsAtDn, 2000, 60000);
GenericTestUtils.waitFor(this::verifyPendingDeletionClearsAtDn, 1000, 60000);
}
}
8 changes: 4 additions & 4 deletions ...con/src/test/java/org/apache/hadoop/ozone/recon/TestStorageDistributionEndpointRatis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ public void testStorageDistributionEndpoint() throws Exception {
closeAllContainers();
getFs().delete(dir1, true);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionOm, 1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionScm, 2000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionScm, 1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionDn, 1000, 60000);
GenericTestUtils.waitFor(() -> Objects.requireNonNull(
getScm().getClientProtocolServer().getDeletedBlockSummary()).getTotalBlockCount() == 0,
1000, 30000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionDn, 2000, 60000);
GenericTestUtils.waitFor(this::verifyPendingDeletionClearsAtDn, 2000, 60000);
GenericTestUtils.waitFor(this::verifyPendingDeletionClearsAtDn, 1000, 60000);
getCluster().getHddsDatanodes().get(0).stop();
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionOnDnFailure, 2000, 60000);
GenericTestUtils.waitFor(this::verifyPendingDeletionAfterKeyDeletionOnDnFailure, 1000, 60000);
}
}
Loading