You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by xy...@apache.org on 2023/05/27 01:07:25 UTC
[helix] branch master updated: Replace deprecated verifier with new set of Verifiers (#2505)
This is an automated email from the ASF dual-hosted git repository.
xyuanlu 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 f2d19e6c2 Replace deprecated verifier with new set of Verifiers (#2505)
f2d19e6c2 is described below
commit f2d19e6c29e23c3c90f7a24a708684ee5c6849a4
Author: Komal Desai <98...@users.noreply.github.com>
AuthorDate: Fri May 26 18:07:20 2023 -0700
Replace deprecated verifier with new set of Verifiers (#2505)
Replace the deprecated verifier with new set of verifiers.
---------
Co-authored-by: Komal Desai <kd...@kdesai-mn1.linkedin.biz>
---
.../manager/TestDistributedControllerManager.java | 23 ++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
index c6a2c3d0f..81dbdad15 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
@@ -36,6 +36,7 @@ import org.apache.helix.mock.participant.MockMSModelFactory;
import org.apache.helix.model.LiveInstance;
import org.apache.helix.tools.ClusterStateVerifier;
import org.apache.helix.tools.ClusterStateVerifier.BestPossAndExtViewZkVerifier;
+import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
@@ -71,18 +72,19 @@ public class TestDistributedControllerManager extends ZkTestBase {
new MockMSModelFactory());
distributedControllers[i].connect();
}
+ BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+ .Builder(clusterName).setZkAddress(ZK_ADDR).build();
- boolean result = ClusterStateVerifier
- .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+ boolean result = verifier.verifyByZkCallback();
Assert.assertTrue(result);
// disconnect first distributed-controller, and verify second takes leadership
distributedControllers[0].disconnect();
- // verify leader changes to localhost_12919
Thread.sleep(100);
- result = ClusterStateVerifier
- .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+
+ // verify leader changes to localhost_12919
+ result = verifier.verifyByZkCallback();
Assert.assertTrue(result);
ZKHelixDataAccessor accessor =
@@ -120,8 +122,9 @@ public class TestDistributedControllerManager extends ZkTestBase {
LOG.debug("Expired distributedController: " + expireController.getInstanceName()
+ ", oldSessionId: " + oldSessionId + ", newSessionId: " + newSessionId);
- boolean result = ClusterStateVerifier.verifyByPolling(
- new ClusterStateVerifier.BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+ BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+ .Builder(clusterName).setZkAddress(ZK_ADDR).build();
+ boolean result = verifier.verifyByPolling();
Assert.assertTrue(result);
// verify leader changes to localhost_12919
@@ -172,9 +175,9 @@ public class TestDistributedControllerManager extends ZkTestBase {
new MockMSModelFactory());
distributedControllers[i].connect();
}
-
- boolean result = ClusterStateVerifier
- .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+ BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+ .Builder(clusterName).setZkAddress(ZK_ADDR).build();
+ boolean result = verifier.verifyByZkCallback();
Assert.assertTrue(result);
// expire localhost_12918