(helix) branch master updated: Extend more time for test stability

[jxue]

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new 186f2e3b1 Extend more time for test stability
186f2e3b1 is described below

commit 186f2e3b189195bd42d6b778f5034822f9912d45
Author: Junkai Xue <j...@apache.org>
AuthorDate: Fri May 29 16:28:46 2026 -0700

    Extend more time for test stability
---
 .../controller/TestClusterMaintenanceMode.java          |  4 ++--
 .../messaging/handling/TestResourceThreadpoolSize.java  | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
 
b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
index 492d46453..9a35247fe 100644
--- 
a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
+++ 
b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterMaintenanceMode.java
@@ -391,7 +391,7 @@ public class TestClusterMaintenanceMode extends 
TaskTestBase {
     TestHelper.verify(() -> {
       ControllerHistory hist = 
_dataAccessor.getProperty(_keyBuilder.controllerLeaderHistory());
       return hist != null && !hist.getMaintenanceHistoryList().isEmpty();
-    }, 2000L);
+    }, 5000L);
 
     ControllerHistory history = 
_dataAccessor.getProperty(_keyBuilder.controllerLeaderHistory());
     Map<String, String> lastHistoryEntry = convertStringToMap(
@@ -408,7 +408,7 @@ public class TestClusterMaintenanceMode extends 
TaskTestBase {
     clusterConfig.setMaxPartitionsPerInstance(-1);
     _manager.getConfigAccessor().setClusterConfig(CLUSTER_NAME, clusterConfig);
 
-    TestHelper.verify(() -> 
_dataAccessor.getProperty(_keyBuilder.maintenance()) == null, 2000L);
+    TestHelper.verify(() -> 
_dataAccessor.getProperty(_keyBuilder.maintenance()) == null, 5000L);
 
     // Now check that the cluster exited maintenance
     // Wait for the EXIT history entry to be written
diff --git 
a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
 
b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
index e51525de9..94895317b 100644
--- 
a/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
+++ 
b/helix-core/src/test/java/org/apache/helix/messaging/handling/TestResourceThreadpoolSize.java
@@ -179,19 +179,20 @@ public class TestResourceThreadpoolSize extends 
ZkStandAloneCMTestBase {
   public void testBatchMessageThreadPoolSize() throws InterruptedException {
     int customizedPoolSize = 5;
     
_participants[0].getStateMachineEngine().registerStateModelFactory("OnlineOffline",
-        new TestOnlineOfflineStateModelFactory(customizedPoolSize, 2000), 
"TestFactory");
+        new TestOnlineOfflineStateModelFactory(customizedPoolSize, 500), 
"TestFactory");
     for (int i = 1; i < _participants.length; i++) {
       _participants[i].syncStop();
     }
     Assert.assertTrue(_clusterVerifier.verifyByPolling());
 
-    // Add 10 dbs with batch message enabled. Each db has 10 partitions.
-    // So it will have 10 batch messages and each batch message has 10 sub 
messages.
-    int numberOfDbs = 10;
+    // Add 5 dbs with batch message enabled. Each db has 5 partitions.
+    // Reduced from 10 DBs x 10 partitions to 5 DBs x 5 partitions = 25 
partitions total
+    // to reduce test runtime while still validating batch message 
functionality
+    int numberOfDbs = 5;
     for (int i = 0; i < numberOfDbs; i++) {
       String dbName = "TestDBABatch" + i;
       IdealState idealState = new 
FullAutoModeISBuilder(dbName).setStateModel("OnlineOffline")
-          
.setStateModelFactoryName("TestFactory").setNumPartitions(10).setNumReplica(1).build();
+          
.setStateModelFactoryName("TestFactory").setNumPartitions(5).setNumReplica(1).build();
       idealState.setBatchMessageMode(true);
       _gSetupTool.getClusterManagementTool().addResource(CLUSTER_NAME, dbName, 
idealState);
       _gSetupTool.rebalanceStorageCluster(CLUSTER_NAME, dbName, 1);
@@ -204,13 +205,13 @@ public class TestResourceThreadpoolSize extends 
ZkStandAloneCMTestBase {
     ThreadPoolExecutor executor = (ThreadPoolExecutor) 
(helixExecutor._batchMessageExecutorService);
     Assert.assertNotNull(executor);
 
-    // Use longer timeout since the state model factory has 2000ms delay per 
transition,
-    // and with 10 DBs x 10 partitions = 100 partitions and only 5 threads in 
the pool,
+    // Use longer timeout since the state model factory has 500ms delay per 
transition,
+    // and with 5 DBs x 5 partitions = 25 partitions and only 5 threads in the 
pool,
     // it takes significant time for all state transitions to complete
     BestPossibleExternalViewVerifier verifier =
         new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME)
             .setZkClient(_gZkClient)
-            .setWaitTillVerify(300000)
+            .setWaitTillVerify(120000)
             .build();
     Assert.assertTrue(verifier.verifyByPolling());
   }