[helix] branch master updated: Revert "Improve TestControllerLeadershipChange test logic to tolerate longer delay when test runs. (#1853)" (#1860)

[jiajunwang]

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

jiajunwang 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 d616ec3  Revert "Improve TestControllerLeadershipChange test logic to 
tolerate longer delay when test runs. (#1853)" (#1860)
d616ec3 is described below

commit d616ec32d8e0b906b401f8736a93bdf0808b2a45
Author: Jiajun Wang <jjw...@linkedin.com>
AuthorDate: Tue Aug 31 13:02:33 2021 -0700

    Revert "Improve TestControllerLeadershipChange test logic to tolerate 
longer delay when test runs. (#1853)" (#1860)
    
    This reverts commit a570d0566c42942b6154cb84a3d44f864fde37f0.
---
 .../controller/TestControllerLeadershipChange.java      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git 
a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
 
b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
index 379feb9..1de1296 100644
--- 
a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
+++ 
b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLeadershipChange.java
@@ -189,7 +189,6 @@ public class TestControllerLeadershipChange extends 
ZkTestBase {
     String resourceName = "testResource";
     int numPartition = 1;
     int numReplica = 1;
-    int simulatedTransitionDelayMs = 100;
     String stateModel = "LeaderStandby";
     ObjectName resourceMBeanObjectName = 
getResourceMonitorObjectName(clusterName, resourceName);
     MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
@@ -206,7 +205,7 @@ public class TestControllerLeadershipChange extends 
ZkTestBase {
     // Create participant
     _gSetupTool.addInstanceToCluster(clusterName, instanceName);
     MockParticipantManager participant =
-        new MockParticipantManager(ZK_ADDR, clusterName, instanceName, 
simulatedTransitionDelayMs);
+        new MockParticipantManager(ZK_ADDR, clusterName, instanceName);
     participant.syncStart();
 
     // Create controller, since this is the only controller, it will be the 
leader
@@ -247,9 +246,6 @@ public class TestControllerLeadershipChange extends 
ZkTestBase {
     Assert.assertTrue(clusterVerifier.verify());
 
     Thread.sleep(1000);
-
-    // The moment before manager1 regain leadership. The topstateless duration 
will start counting.
-    long start = System.currentTimeMillis();
     setLeader(manager1);
 
     Assert.assertTrue(manager1.isLeader());
@@ -262,19 +258,12 @@ public class TestControllerLeadershipChange extends 
ZkTestBase {
     _gSetupTool.rebalanceResource(clusterName, resourceName, numReplica);
 
     Assert.assertTrue(clusterVerifier.verifyByPolling());
-    // The moment that partition top state has been recovered. The 
topstateless duration stopped counting.
-    long end = System.currentTimeMillis();
 
     // Resource lost top state, and manager1 lost leadership for 2000ms, 
because manager1 will
     // clean monitoring cache after re-gaining leadership, so max value of 
hand off duration should
     // not have such a large value
-    long duration = (long) beanServer
-        .getAttribute(resourceMBeanObjectName, 
"PartitionTopStateHandoffDurationGauge.Max");
-    long controllerOpDuration = end - start;
-    Assert.assertTrue(duration >= simulatedTransitionDelayMs && duration <= 
controllerOpDuration,
-        String.format(
-            "The recorded TopState-less duration is %d. But the controller 
operation duration is %d.",
-            duration, controllerOpDuration));
+    Assert.assertTrue((long) beanServer
+        .getAttribute(resourceMBeanObjectName, 
"PartitionTopStateHandoffDurationGauge.Max") < 500);
 
     participant.syncStop();
     manager1.disconnect();