From ffcae1452cfce11b52e950b074982a70a7a1f498 Mon Sep 17 00:00:00 2001 From: Komal Desai Date: Tue, 23 May 2023 23:48:13 -0700 Subject: [PATCH 1/3] Replace deprecated verifier with new set of Verifiers --- .../TestDistributedControllerManager.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 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 c6a2c3d0f7..acf53b7232 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.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,9 +72,10 @@ public void simpleIntegrationTest() throws Exception { 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 @@ -81,8 +83,7 @@ public void simpleIntegrationTest() throws Exception { // verify leader changes to localhost_12919 Thread.sleep(100); - result = ClusterStateVerifier - .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName)); + result = verifier.verifyByZkCallback(); Assert.assertTrue(result); ZKHelixDataAccessor accessor = @@ -120,8 +121,9 @@ private void expireController(ClusterDistributedController expireController, 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 +174,9 @@ public void simpleSessionExpiryTest() throws Exception { 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 From 9383143797b0648aab0076d833444b9b122afa52 Mon Sep 17 00:00:00 2001 From: Komal Desai Date: Wed, 24 May 2023 15:44:57 -0700 Subject: [PATCH 2/3] Address comments --- .../manager/TestDistributedControllerManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 acf53b7232..8d44f06d93 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 @@ -82,8 +82,9 @@ public void simpleIntegrationTest() throws Exception { distributedControllers[0].disconnect(); // verify leader changes to localhost_12919 - Thread.sleep(100); - result = verifier.verifyByZkCallback(); + result = TestHelper.verify(() -> { + return verifier.verifyByZkCallback(); + }, 100); Assert.assertTrue(result); ZKHelixDataAccessor accessor = From a70739a9477fffbe0d2445a40bd21fe48f266e60 Mon Sep 17 00:00:00 2001 From: Komal Desai Date: Thu, 25 May 2023 13:58:39 -0700 Subject: [PATCH 3/3] Revert the TestHelper.verifier --- .../manager/TestDistributedControllerManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 8d44f06d93..81dbdad15c 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 @@ -81,10 +81,10 @@ public void simpleIntegrationTest() throws Exception { // disconnect first distributed-controller, and verify second takes leadership distributedControllers[0].disconnect(); + Thread.sleep(100); + // verify leader changes to localhost_12919 - result = TestHelper.verify(() -> { - return verifier.verifyByZkCallback(); - }, 100); + result = verifier.verifyByZkCallback(); Assert.assertTrue(result); ZKHelixDataAccessor accessor =