You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2018/07/14 00:14:34 UTC
[4/8] helix git commit: Fix a couple of tests,
and reduce the total test times.
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/TestSyncSessionToController.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestSyncSessionToController.java b/helix-core/src/test/java/org/apache/helix/integration/TestSyncSessionToController.java
index 4579dfb..2960b6e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestSyncSessionToController.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestSyncSessionToController.java
@@ -2,7 +2,6 @@ package org.apache.helix.integration;
import java.util.Date;
import java.util.List;
-
import org.apache.helix.InstanceType;
import org.apache.helix.MessageListener;
import org.apache.helix.NotificationContext;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
index 243ce9e..fd31ba3 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestWeightBasedRebalanceUtil.java
@@ -1,11 +1,19 @@
package org.apache.helix.integration;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.apache.helix.HelixException;
import org.apache.helix.ZNRecord;
import org.apache.helix.api.config.RebalanceConfig;
import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceHardConstraint;
import org.apache.helix.api.rebalancer.constraint.AbstractRebalanceSoftConstraint;
import org.apache.helix.api.rebalancer.constraint.dataprovider.PartitionWeightProvider;
+import org.apache.helix.common.ZkTestBase;
import org.apache.helix.controller.common.PartitionStateMap;
import org.apache.helix.controller.common.ResourcesStateMap;
import org.apache.helix.controller.rebalancer.constraint.PartitionWeightAwareEvennessConstraint;
@@ -14,8 +22,11 @@ import org.apache.helix.controller.rebalancer.constraint.dataprovider.MockCapaci
import org.apache.helix.controller.rebalancer.constraint.dataprovider.MockPartitionWeightProvider;
import org.apache.helix.controller.rebalancer.constraint.dataprovider.ZkBasedCapacityProvider;
import org.apache.helix.controller.rebalancer.constraint.dataprovider.ZkBasedPartitionWeightProvider;
-import org.apache.helix.common.ZkTestBase;
-import org.apache.helix.model.*;
+import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.InstanceConfig;
+import org.apache.helix.model.OnlineOfflineSMD;
+import org.apache.helix.model.Partition;
+import org.apache.helix.model.ResourceConfig;
import org.apache.helix.util.WeightAwareRebalanceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -24,8 +35,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.*;
-
import static org.apache.helix.controller.rebalancer.constraint.dataprovider.ZkBasedPartitionWeightProvider.DEFAULT_WEIGHT_VALUE;
public class TestWeightBasedRebalanceUtil extends ZkTestBase {
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
index f73560b..0ffe8e0 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkCallbackHandlerLeak.java
@@ -23,20 +23,23 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.I0Itec.zkclient.IZkChildListener;
import org.I0Itec.zkclient.IZkDataListener;
-import org.apache.helix.*;
+import org.apache.helix.CurrentStateChangeListener;
+import org.apache.helix.NotificationContext;
+import org.apache.helix.PropertyKey;
+import org.apache.helix.TestHelper;
+import org.apache.helix.ZkTestHelper;
+import org.apache.helix.ZkUnitTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.integration.manager.ZkTestManager;
import org.apache.helix.manager.zk.CallbackHandler;
import org.apache.helix.manager.zk.ZkClient;
import org.apache.helix.model.CurrentState;
-import org.apache.helix.monitoring.mbeans.ThreadPoolExecutorMonitor;
import org.apache.helix.tools.ClusterStateVerifier;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
@@ -79,8 +82,8 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
participants[i].syncStart();
}
- HelixClusterVerifier verifier = new BestPossibleExternalViewVerifier.Builder(clusterName).setZkAddr(ZK_ADDR).build();
- Assert.assertTrue(verifier.verify());
+ ZkHelixClusterVerifier verifier = new BestPossibleExternalViewVerifier.Builder(clusterName).setZkAddr(ZK_ADDR).build();
+ Assert.assertTrue(verifier.verifyByPolling());
final MockParticipantManager participantManagerToExpire = participants[1];
// check controller zk-watchers
@@ -184,6 +187,7 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -221,9 +225,9 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
participants[i].syncStart();
}
- HelixClusterVerifier verifier =
+ ZkHelixClusterVerifier verifier =
new BestPossibleExternalViewVerifier.Builder(clusterName).setZkAddr(ZK_ADDR).build();
- Assert.assertTrue(verifier.verify());
+ Assert.assertTrue(verifier.verifyByPolling());
final MockParticipantManager participantManager = participants[0];
// wait until we get all the listeners registered
@@ -259,7 +263,7 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
"Expired controller session. oldSessionId: " + oldSessionId + ", newSessionId: "
+ newSessionId);
- Assert.assertTrue(verifier.verify());
+ Assert.assertTrue(verifier.verifyByPolling());
// check controller zk-watchers
boolean result = TestHelper.verify(new TestHelper.Verifier() {
@@ -308,6 +312,7 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -410,9 +415,9 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
String newSessionId = participantToExpire.getSessionId();
System.out.println(participantToExpire.getInstanceName() + " oldSessionId: " + oldSessionId
+ ", newSessionId: " + newSessionId);
- HelixClusterVerifier verifier =
+ ZkHelixClusterVerifier verifier =
new BestPossibleExternalViewVerifier.Builder(clusterName).setZkAddr(ZK_ADDR).build();
- Assert.assertTrue(verifier.verify());
+ Assert.assertTrue(verifier.verifyByPolling());
// check manager#hanlders
Assert
@@ -460,7 +465,7 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
+ participantToExpire.getSessionId());
ZkTestHelper.expireSession(participantToExpire.getZkClient());
- Assert.assertTrue(verifier.verify());
+ Assert.assertTrue(verifier.verifyByPolling());
// check zookeeper#watches on client side
watchPaths = ZkTestHelper.getZkWatch(participantToExpire.getZkClient());
@@ -482,6 +487,7 @@ public class TestZkCallbackHandlerLeak extends ZkUnitTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
index c6a795e..2769a9f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkConnectionLost.java
@@ -2,6 +2,11 @@ package org.apache.helix.integration;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
import org.I0Itec.zkclient.ZkServer;
import org.apache.helix.HelixException;
import org.apache.helix.SystemPropertyKeys;
@@ -20,7 +25,7 @@ import org.apache.helix.task.TaskState;
import org.apache.helix.task.WorkflowContext;
import org.apache.helix.tools.ClusterSetup;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
@@ -28,12 +33,6 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
-
public class TestZkConnectionLost extends TaskTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TestZkConnectionLost.class);
@@ -62,9 +61,9 @@ public class TestZkConnectionLost extends TaskTestBase {
_controller = new ClusterControllerManager(_zkAddr, CLUSTER_NAME, controllerName);
_controller.syncStart();
- HelixClusterVerifier clusterVerifier =
+ ZkHelixClusterVerifier clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(_zkAddr).build();
- Assert.assertTrue(clusterVerifier.verify());
+ Assert.assertTrue(clusterVerifier.verifyByPolling());
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
index afacb7a..411f656 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestZkSessionExpiry.java
@@ -19,12 +19,12 @@ package org.apache.helix.integration;
* under the License.
*/
+import com.google.common.collect.ImmutableList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
-
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManager;
import org.apache.helix.NotificationContext;
@@ -36,15 +36,12 @@ import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.messaging.handling.HelixTaskResult;
import org.apache.helix.messaging.handling.MessageHandler;
-import org.apache.helix.messaging.handling.MessageHandlerFactory;
import org.apache.helix.messaging.handling.MultiTypeMessageHandlerFactory;
import org.apache.helix.model.Message;
import org.apache.helix.tools.ClusterStateVerifier;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableList;
-
public class TestZkSessionExpiry extends ZkUnitTestBase {
final static String DUMMY_MSG_TYPE = "DUMMY";
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java b/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
index 3cbffe1..cfc6ffd 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/common/ZkStandAloneCMTestBase.java
@@ -20,18 +20,14 @@ package org.apache.helix.integration.common;
*/
import java.util.Date;
-
import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
import org.apache.helix.common.ZkTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
-import org.apache.helix.tools.ClusterStateVerifier;
-import org.apache.helix.tools.ClusterStateVerifier.BestPossAndExtViewZkVerifier;
-import org.apache.helix.tools.ClusterStateVerifier.MasterNbInExtViewVerifier;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
@@ -56,11 +52,10 @@ public class ZkStandAloneCMTestBase extends ZkTestBase {
protected final String CLASS_NAME = getShortClassName();
protected final String CLUSTER_NAME = CLUSTER_PREFIX + "_" + CLASS_NAME;
- HelixClusterVerifier _clusterVerifier;
+ protected ZkHelixClusterVerifier _clusterVerifier;
protected MockParticipantManager[] _participants = new MockParticipantManager[NODE_NR];
protected ClusterControllerManager _controller;
-
protected int _replica = 3;
@BeforeClass
@@ -89,18 +84,8 @@ public class ZkStandAloneCMTestBase extends ZkTestBase {
_controller = new ClusterControllerManager(ZK_ADDR, CLUSTER_NAME, controllerName);
_controller.syncStart();
- boolean result =
- ClusterStateVerifier
- .verifyByZkCallback(new MasterNbInExtViewVerifier(ZK_ADDR, CLUSTER_NAME));
-
_clusterVerifier = new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR).build();
-
- Assert.assertTrue(result);
-
- result =
- ClusterStateVerifier.verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR,
- CLUSTER_NAME));
- Assert.assertTrue(result);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
// create cluster manager
_manager = HelixManagerFactory
@@ -125,16 +110,7 @@ public class ZkStandAloneCMTestBase extends ZkTestBase {
_manager.disconnect();
}
- String namespace = "/" + CLUSTER_NAME;
- if (_gZkClient.exists(namespace)) {
- try {
- _gSetupTool.deleteCluster(CLUSTER_NAME);
- } catch (Exception ex) {
- System.err.println(
- "Failed to delete cluster " + CLUSTER_NAME + ", error: " + ex.getLocalizedMessage());
- }
- }
-
+ deleteCluster(CLUSTER_NAME);
System.out.println("END " + CLASS_NAME + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterDataCacheSelectiveUpdate.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterDataCacheSelectiveUpdate.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterDataCacheSelectiveUpdate.java
index 6202f84..a749265 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterDataCacheSelectiveUpdate.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestClusterDataCacheSelectiveUpdate.java
@@ -27,8 +27,6 @@ import org.apache.helix.controller.stages.ClusterDataCache;
import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.mock.MockZkHelixDataAccessor;
-import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -104,9 +102,7 @@ public class TestClusterDataCacheSelectiveUpdate extends ZkStandAloneCMTestBase
_gSetupTool.rebalanceStorageCluster(CLUSTER_NAME, "TestDB_1", _replica);
Thread.sleep(100);
- HelixClusterVerifier _clusterVerifier =
- new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
accessor.clearReadCounters();
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
index 2322d3d..8a20b22 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerHistory.java
@@ -18,6 +18,8 @@ package org.apache.helix.integration.controller;
* specific language governing permissions and limitations
* under the License.
*/
+
+import java.util.List;
import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
@@ -28,8 +30,6 @@ import org.apache.helix.model.LeaderHistory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.util.List;
-
public class TestControllerHistory extends ZkStandAloneCMTestBase {
@Test()
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
index 0dff764..92ead5d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestControllerLiveLock.java
@@ -22,7 +22,6 @@ package org.apache.helix.integration.controller;
import java.util.Date;
import java.util.Map;
import java.util.Random;
-
import org.apache.helix.BaseDataAccessor;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.PropertyKey;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
index 822e060..1577efa 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestGenericHelixControllerThreading.java
@@ -21,8 +21,8 @@ package org.apache.helix.integration.controller;
import java.util.ArrayList;
import java.util.Set;
-import org.apache.helix.controller.GenericHelixController;
import org.apache.helix.ZkUnitTestBase;
+import org.apache.helix.controller.GenericHelixController;
import org.testng.Assert;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
index 9103db1..b5c828f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/controller/TestTargetExternalView.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.controller;
*/
import java.util.List;
-
import org.apache.helix.ConfigAccessor;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.integration.task.TaskTestBase;
@@ -28,7 +27,7 @@ import org.apache.helix.model.ClusterConfig;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -60,8 +59,8 @@ public class TestTargetExternalView extends TaskTestBase {
_configAccessor.setClusterConfig(CLUSTER_NAME, clusterConfig);
_gSetupTool.getClusterManagementTool().rebalance(CLUSTER_NAME, _testDbs.get(0), 3);
- HelixClusterVerifier verifier = new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR).build();
- Assert.assertTrue(verifier.verify());
+ ZkHelixClusterVerifier verifier = new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR).build();
+ Assert.assertTrue(verifier.verifyByPolling());
Assert
.assertEquals(_accessor.getChildNames(_accessor.keyBuilder().targetExternalViews()).size(),
@@ -81,7 +80,7 @@ public class TestTargetExternalView extends TaskTestBase {
// Disable one instance to see whether the target external views changes.
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, _participants[0].getInstanceName(), false);
- Assert.assertTrue(verifier.verify());
+ Assert.assertTrue(verifier.verifyByPolling());
targetExternalViews = _accessor.getChildValues(_accessor.keyBuilder().externalViews());
idealStates = _accessor.getChildValues(_accessor.keyBuilder().idealStates());
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
index f007d9e..ffa2cb2 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterControllerManager.java
@@ -21,7 +21,6 @@ package org.apache.helix.integration.manager;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-
import org.apache.helix.HelixTimerTask;
import org.apache.helix.InstanceType;
import org.apache.helix.manager.zk.CallbackHandler;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
index d79f5cc..1cce08d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ClusterDistributedController.java
@@ -21,7 +21,6 @@ package org.apache.helix.integration.manager;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-
import org.apache.helix.InstanceType;
import org.apache.helix.manager.zk.CallbackHandler;
import org.apache.helix.manager.zk.ZKHelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
index 55316ac..2bd2630 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/MockParticipantManager.java
@@ -21,7 +21,6 @@ package org.apache.helix.integration.manager;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-
import org.apache.helix.InstanceType;
import org.apache.helix.manager.zk.CallbackHandler;
import org.apache.helix.manager.zk.ZKHelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
index a30de78..bd910e9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestConsecutiveZkSessionExpiry.java
@@ -22,7 +22,6 @@ package org.apache.helix.integration.manager;
import java.util.Date;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.PreConnectCallback;
import org.apache.helix.PropertyKey;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
index 0234300..a7f7a7b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestControllerManager.java
@@ -21,7 +21,6 @@ package org.apache.helix.integration.manager;
import java.util.Date;
import java.util.concurrent.TimeUnit;
-
import org.apache.helix.TestHelper;
import org.apache.helix.ZkTestHelper;
import org.apache.helix.ZkUnitTestBase;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
----------------------------------------------------------------------
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 ef59f31..0a1b9fb 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
@@ -21,7 +21,6 @@ package org.apache.helix.integration.manager;
import java.util.Date;
import java.util.List;
-
import org.apache.helix.HelixManager;
import org.apache.helix.InstanceType;
import org.apache.helix.PropertyKey;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
index 7e6d931..129072b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestHelixDataAccessor.java
@@ -10,8 +10,8 @@ import org.apache.helix.HelixProperty;
import org.apache.helix.PropertyKey;
import org.apache.helix.ZNRecord;
import org.apache.helix.api.exceptions.HelixMetaDataAccessException;
-import org.apache.helix.controller.stages.ClusterDataCache;
import org.apache.helix.common.ZkTestBase;
+import org.apache.helix.controller.stages.ClusterDataCache;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.mock.MockZkClient;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
index d21f46e..3588366 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestParticipantManager.java
@@ -19,11 +19,10 @@ package org.apache.helix.integration.manager;
* under the License.
*/
-import java.util.Date;
+import java.lang.reflect.Method;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-
import org.apache.helix.HelixManager;
import org.apache.helix.InstanceType;
import org.apache.helix.NotificationContext;
@@ -45,22 +44,29 @@ import org.apache.helix.tools.ClusterStateVerifier.BestPossAndExtViewZkVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
+import org.testng.ITestContext;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
public class TestParticipantManager extends ZkTestBase {
private static Logger LOG = LoggerFactory.getLogger(TestParticipantManager.class);
+ String clusterName = TestHelper.getTestClassName();
+
+
+ @AfterMethod
+ public void afterMethod(Method testMethod, ITestContext testContext) {
+ if (_gZkClient.exists("/" + clusterName)) {
+ _gSetupTool.deleteCluster(clusterName);
+ }
+ super.endTest(testMethod, testContext);
+ }
+
@Test
public void simpleIntegrationTest() throws Exception {
- // Logger.getRootLogger().setLevel(Level.INFO);
- String className = TestHelper.getTestClassName();
- String methodName = TestHelper.getTestMethodName();
- String clusterName = className + "_" + methodName;
int n = 1;
- System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
-
TestHelper.setupCluster(clusterName, ZK_ADDR, 12918, // participant port
"localhost", // participant name prefix
"TestDB", // resource name prefix
@@ -95,21 +101,13 @@ public class TestParticipantManager extends ZkTestBase {
PropertyKey.Builder keyBuilder = accessor.keyBuilder();
Assert.assertNull(accessor.getProperty(keyBuilder.liveInstance("localhost_12918")));
Assert.assertNull(accessor.getProperty(keyBuilder.controllerLeader()));
-
- System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@Test
public void simpleSessionExpiryTest() throws Exception {
// Logger.getRootLogger().setLevel(Level.WARN);
-
- String className = TestHelper.getTestClassName();
- String methodName = TestHelper.getTestMethodName();
- final String clusterName = className + "_" + methodName;
int n = 1;
- System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
-
MockParticipantManager[] participants = new MockParticipantManager[n];
TestHelper.setupCluster(clusterName, ZK_ADDR, 12918, // participant port
@@ -157,9 +155,6 @@ public class TestParticipantManager extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
-
- System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
-
}
class SessionExpiryTransition extends MockTransition {
@@ -188,15 +183,10 @@ public class TestParticipantManager extends ZkTestBase {
@Test
public void testSessionExpiryInTransition() throws Exception {
- String className = TestHelper.getTestClassName();
- String methodName = TestHelper.getTestMethodName();
- final String clusterName = className + "_" + methodName;
int n = 1;
CountDownLatch startCountdown = new CountDownLatch(1);
CountDownLatch endCountdown = new CountDownLatch(1);
- System.out.println("START " + clusterName + " at " + new Date(System.currentTimeMillis()));
-
MockParticipantManager[] participants = new MockParticipantManager[n];
TestHelper.setupCluster(clusterName, ZK_ADDR, 12918, // participant port
@@ -251,7 +241,5 @@ public class TestParticipantManager extends ZkTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
-
- System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
index a9db740..0521e7a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestStateModelLeak.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-
import org.apache.helix.HelixAdmin;
import org.apache.helix.TestHelper;
import org.apache.helix.ZkUnitTestBase;
@@ -117,6 +116,7 @@ public class TestStateModelLeak extends ZkUnitTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
@@ -202,6 +202,7 @@ public class TestStateModelLeak extends ZkUnitTestBase {
for (int i = 0; i < n; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
index 280786c..c189bad 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/ZkTestManager.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.manager;
*/
import java.util.List;
-
import org.apache.helix.manager.zk.CallbackHandler;
import org.apache.helix.manager.zk.ZkClient;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
index f2c4622..db9d214 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessage.java
@@ -24,12 +24,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.I0Itec.zkclient.IZkChildListener;
-import org.apache.helix.TestHelper;
-import org.apache.helix.ZNRecord;
import org.apache.helix.HelixProperty.HelixPropertyAttribute;
import org.apache.helix.PropertyKey.Builder;
+import org.apache.helix.TestHelper;
+import org.apache.helix.ZNRecord;
import org.apache.helix.common.ZkTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
index f3f469e..4eedcf9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestBatchMessageWrapper.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.messaging;
*/
import java.util.Date;
-
import org.apache.helix.NotificationContext;
import org.apache.helix.PropertyKey.Builder;
import org.apache.helix.TestHelper;
@@ -35,7 +34,7 @@ import org.apache.helix.mock.participant.MockMSModelFactory;
import org.apache.helix.model.IdealState;
import org.apache.helix.model.Message;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -106,10 +105,10 @@ public class TestBatchMessageWrapper extends ZkUnitTestBase {
participants[i].syncStart();
// wait for each participant to complete state transitions, so we have deterministic results
- HelixClusterVerifier _clusterVerifier =
+ ZkHelixClusterVerifier _clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(clusterName).setZkAddr(ZK_ADDR).build();
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify(),
+ Assert.assertTrue(_clusterVerifier.verifyByPolling(),
"participant: " + instanceName + " fails to complete all transitions");
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
index 01fb0d8..a1f71dc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle.java
@@ -22,7 +22,6 @@ package org.apache.helix.integration.messaging;
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-
import org.I0Itec.zkclient.IZkChildListener;
import org.apache.helix.HelixAdmin;
import org.apache.helix.PropertyPathBuilder;
@@ -34,8 +33,8 @@ import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.manager.zk.ZKHelixAdmin;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
-import org.apache.helix.model.Message;
import org.apache.helix.model.ClusterConstraints.ConstraintType;
+import org.apache.helix.model.Message;
import org.apache.helix.model.builder.ConstraintItemBuilder;
import org.apache.helix.tools.ClusterStateVerifier;
import org.apache.helix.tools.ClusterStateVerifier.BestPossAndExtViewZkVerifier;
@@ -142,6 +141,7 @@ public class TestMessageThrottle extends ZkTestBase {
for (int i = 0; i < 5; i++) {
participants[i].syncStop();
}
+ TestHelper.dropCluster(clusterName, _gZkClient);
System.out.println("END " + clusterName + " at " + new Date(System.currentTimeMillis()));
}
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
index 83ac0bc..4ae41ac 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessageThrottle2.java
@@ -26,7 +26,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.helix.ControllerChangeListener;
import org.apache.helix.ExternalViewChangeListener;
import org.apache.helix.HelixAdmin;
@@ -40,8 +39,8 @@ import org.apache.helix.NotificationContext;
import org.apache.helix.PropertyKey.Builder;
import org.apache.helix.TestHelper;
import org.apache.helix.ZNRecord;
-import org.apache.helix.controller.HelixControllerMain;
import org.apache.helix.common.ZkTestBase;
+import org.apache.helix.controller.HelixControllerMain;
import org.apache.helix.manager.zk.ZKHelixAdmin;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
import org.apache.helix.manager.zk.ZKHelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
index 6d218ef..0edb287 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestMessagingService.java
@@ -19,19 +19,18 @@ package org.apache.helix.integration.messaging;
* under the License.
*/
+import com.google.common.collect.ImmutableList;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
-
import org.apache.helix.Criteria;
+import org.apache.helix.Criteria.DataSource;
import org.apache.helix.InstanceType;
import org.apache.helix.NotificationContext;
-import org.apache.helix.Criteria.DataSource;
import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
import org.apache.helix.messaging.AsyncCallback;
import org.apache.helix.messaging.handling.HelixTaskResult;
import org.apache.helix.messaging.handling.MessageHandler;
-import org.apache.helix.messaging.handling.MessageHandlerFactory;
import org.apache.helix.messaging.handling.MultiTypeMessageHandlerFactory;
import org.apache.helix.model.Message;
import org.apache.helix.model.Message.MessageState;
@@ -39,8 +38,6 @@ import org.apache.helix.model.Message.MessageType;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableList;
-
public class TestMessagingService extends ZkStandAloneCMTestBase {
public static class TestMessagingHandlerFactory implements MultiTypeMessageHandlerFactory {
public static HashSet<String> _processedMsgIds = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
index d1fa2c0..0a9ee55 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestP2PMessageSemiAuto.java
@@ -26,9 +26,9 @@ import java.util.Map;
import org.apache.helix.ConfigAccessor;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.api.config.HelixConfigProperty;
+import org.apache.helix.common.ZkTestBase;
import org.apache.helix.controller.stages.ClusterDataCache;
import org.apache.helix.integration.DelayedTransitionBase;
-import org.apache.helix.common.ZkTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.manager.zk.ZKHelixDataAccessor;
@@ -39,7 +39,7 @@ import org.apache.helix.model.LiveInstance;
import org.apache.helix.model.MasterSlaveSMD;
import org.apache.helix.model.ResourceConfig;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -62,7 +62,7 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
List<String> _instances = new ArrayList<>();
ClusterControllerManager _controller;
- HelixClusterVerifier _clusterVerifier;
+ ZkHelixClusterVerifier _clusterVerifier;
ConfigAccessor _configAccessor;
HelixDataAccessor _accessor;
@@ -101,7 +101,7 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
_controller.syncStart();
_clusterVerifier = new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkClient(_gZkClient).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
_configAccessor = new ConfigAccessor(_gZkClient);
_accessor = new ZKHelixDataAccessor(CLUSTER_NAME, _baseAccessor);
@@ -125,14 +125,14 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
String prevMasterInstance = _instances.get(0);
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, false);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1,_instances.get(1), MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
verifyP2PMessage(DB_NAME_2,_instances.get(1), MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
//re-enable the old master
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, true);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
verifyP2PMessage(DB_NAME_2, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
@@ -148,13 +148,13 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
String prevMasterInstance = _instances.get(0);
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, false);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1, _instances.get(1), MasterSlaveSMD.States.MASTER.name(), prevMasterInstance);
verifyP2PMessage(DB_NAME_2, _instances.get(1), MasterSlaveSMD.States.MASTER.name(), prevMasterInstance);
//re-enable the old master
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, true);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _instances.get(1));
verifyP2PMessage(DB_NAME_2, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _instances.get(1));
@@ -171,14 +171,14 @@ public class TestP2PMessageSemiAuto extends ZkTestBase {
String prevMasterInstance = _instances.get(0);
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, false);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1, _instances.get(1), MasterSlaveSMD.States.MASTER.name(), prevMasterInstance);
verifyP2PMessage(DB_NAME_2, _instances.get(1), MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
//re-enable the old master
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, prevMasterInstance, true);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
verifyP2PMessage(DB_NAME_1, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _instances.get(1));
verifyP2PMessage(DB_NAME_2, prevMasterInstance, MasterSlaveSMD.States.MASTER.name(), _controller.getInstanceName());
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
index 4c2144d..7ded666 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage.java
@@ -19,6 +19,7 @@ package org.apache.helix.integration.messaging;
* under the License.
*/
+import com.google.common.collect.ImmutableList;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
@@ -29,7 +30,6 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CountDownLatch;
-
import org.apache.helix.Criteria;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManager;
@@ -44,7 +44,6 @@ import org.apache.helix.manager.zk.DefaultSchedulerMessageHandlerFactory;
import org.apache.helix.messaging.AsyncCallback;
import org.apache.helix.messaging.handling.HelixTaskResult;
import org.apache.helix.messaging.handling.MessageHandler;
-import org.apache.helix.messaging.handling.MessageHandlerFactory;
import org.apache.helix.messaging.handling.MultiTypeMessageHandlerFactory;
import org.apache.helix.model.ClusterConstraints.ConstraintType;
import org.apache.helix.model.ConstraintItem;
@@ -58,8 +57,6 @@ import org.codehaus.jackson.map.SerializationConfig;
import org.testng.Assert;
import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableList;
-
public class TestSchedulerMessage extends ZkStandAloneCMTestBase {
public static class MockAsyncCallback extends AsyncCallback {
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
index 3691384..40df6d6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMessage2.java
@@ -22,7 +22,6 @@ package org.apache.helix.integration.messaging;
import java.io.StringWriter;
import java.util.Set;
import java.util.UUID;
-
import org.apache.helix.Criteria;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
index c283301..2380c2d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgContraints.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
-
import org.apache.helix.Criteria;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
index f0068d3..afb0180 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/messaging/TestSchedulerMsgUsingQueue.java
@@ -22,7 +22,6 @@ package org.apache.helix.integration.messaging;
import java.io.StringWriter;
import java.util.Set;
import java.util.UUID;
-
import org.apache.helix.Criteria;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
index f48fb0f..ab1c402 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestInstanceHistory.java
@@ -18,6 +18,8 @@ package org.apache.helix.integration.paticipant;
* specific language governing permissions and limitations
* under the License.
*/
+
+import java.util.List;
import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
@@ -27,8 +29,6 @@ import org.apache.helix.model.ParticipantHistory;
import org.testng.Assert;
import org.testng.annotations.Test;
-import java.util.List;
-
public class TestInstanceHistory extends ZkStandAloneCMTestBase {
@Test() public void testInstanceHistory() throws Exception {
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
index a937c41..fcaa19f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestNonOfflineInitState.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.paticipant;
*/
import java.util.Date;
-
import org.apache.helix.TestHelper;
import org.apache.helix.common.ZkTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
index cd729c1..9fa9615 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantErrorMessage.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.paticipant;
*/
import java.util.UUID;
-
import org.apache.helix.Criteria;
import org.apache.helix.InstanceType;
import org.apache.helix.PropertyKey.Builder;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
index 93819fd..93a32ef 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestParticipantNameCollision.java
@@ -20,7 +20,6 @@ package org.apache.helix.integration.paticipant;
*/
import java.util.Date;
-
import org.apache.helix.TestHelper;
import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
import org.apache.helix.integration.manager.MockParticipantManager;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
index cf9f240..b93397a 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestRestartParticipant.java
@@ -21,7 +21,6 @@ package org.apache.helix.integration.paticipant;
import java.util.Date;
import java.util.concurrent.atomic.AtomicReference;
-
import org.apache.helix.NotificationContext;
import org.apache.helix.TestHelper;
import org.apache.helix.common.ZkTestBase;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
index 83b97a5..2f562e1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeout.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.NotificationContext;
import org.apache.helix.PropertyKey.Builder;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
index 2e9af04..bf3c84e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/paticipant/TestStateTransitionTimeoutWithResource.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
import org.apache.helix.ConfigAccessor;
import org.apache.helix.HelixDataAccessor;
import org.apache.helix.HelixManagerFactory;
@@ -50,13 +49,11 @@ import org.apache.helix.participant.statemachine.StateModelFactory;
import org.apache.helix.participant.statemachine.StateModelInfo;
import org.apache.helix.participant.statemachine.StateTransitionError;
import org.apache.helix.participant.statemachine.Transition;
-import org.apache.helix.tools.ClusterSetup;
import org.apache.helix.tools.ClusterStateVerifier;
import org.apache.helix.tools.ClusterStateVerifier.MasterNbInExtViewVerifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
-import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
index 05286a7..83d1bbf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalance.java
@@ -26,9 +26,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
-import org.apache.helix.controller.rebalancer.strategy.*;
import org.apache.helix.common.ZkTestBase;
+import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
+import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
+import org.apache.helix.controller.rebalancer.strategy.MultiRoundCrushRebalanceStrategy;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.model.BuiltInStateModelDefinitions;
@@ -37,7 +38,7 @@ import org.apache.helix.model.IdealState;
import org.apache.helix.model.IdealState.RebalanceMode;
import org.apache.helix.model.InstanceConfig;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -123,10 +124,10 @@ public class TestCrushAutoRebalance extends ZkTestBase {
}
Thread.sleep(300);
- HelixClusterVerifier _clusterVerifier =
+ ZkHelixClusterVerifier _clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR)
.setResources(_allDBs).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _allDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
@@ -154,10 +155,10 @@ public class TestCrushAutoRebalance extends ZkTestBase {
}
Thread.sleep(300);
- HelixClusterVerifier _clusterVerifier =
+ ZkHelixClusterVerifier _clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR)
.setResources(_allDBs).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _allDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
@@ -189,12 +190,11 @@ public class TestCrushAutoRebalance extends ZkTestBase {
_gSetupTool.rebalanceStorageCluster(CLUSTER_NAME, db, _replica);
_allDBs.add(db);
}
- Thread.sleep(300);
-
- HelixClusterVerifier _clusterVerifier =
+ Thread.sleep(100);
+ ZkHelixClusterVerifier _clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR)
.setResources(_allDBs).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _allDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
@@ -232,10 +232,10 @@ public class TestCrushAutoRebalance extends ZkTestBase {
}
Thread.sleep(300);
- HelixClusterVerifier _clusterVerifier =
+ ZkHelixClusterVerifier _clusterVerifier =
new BestPossibleExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR)
.setResources(_allDBs).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _allDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
index 5005858..5576fcc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceNonRack.java
@@ -19,17 +19,28 @@ package org.apache.helix.integration.rebalancer.CrushRebalancers;
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.helix.ConfigAccessor;
import org.apache.helix.controller.rebalancer.strategy.CrushEdRebalanceStrategy;
import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
import org.apache.helix.integration.common.ZkStandAloneCMTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
-import org.apache.helix.model.*;
+import org.apache.helix.model.BuiltInStateModelDefinitions;
+import org.apache.helix.model.ClusterConfig;
+import org.apache.helix.model.ExternalView;
+import org.apache.helix.model.IdealState;
import org.apache.helix.model.IdealState.RebalanceMode;
-import org.apache.helix.tools.ClusterSetup;
+import org.apache.helix.model.InstanceConfig;
import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
import org.apache.helix.tools.ClusterVerifiers.StrictMatchExternalViewVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -37,8 +48,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import java.util.*;
-
public class TestCrushAutoRebalanceNonRack extends ZkStandAloneCMTestBase {
final int NUM_NODE = 6;
protected static final int START_PORT = 12918;
@@ -240,10 +249,10 @@ public class TestCrushAutoRebalanceNonRack extends ZkStandAloneCMTestBase {
_allDBs.add(db);
}
Thread.sleep(300);
- HelixClusterVerifier _clusterVerifier =
+ ZkHelixClusterVerifier _clusterVerifier =
new StrictMatchExternalViewVerifier.Builder(CLUSTER_NAME).setZkAddr(ZK_ADDR)
.setResources(_allDBs).build();
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _allDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
ExternalView ev =
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
index 92da126..4a89230 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalance.java
@@ -26,16 +26,16 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.helix.common.ZkTestBase;
import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
-import org.apache.helix.common.ZkTestBase;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
import org.apache.helix.model.BuiltInStateModelDefinitions;
import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.apache.helix.tools.ClusterVerifiers.HelixClusterVerifier;
+import org.apache.helix.tools.ClusterVerifiers.ZkHelixClusterVerifier;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@ -55,7 +55,7 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
List<MockParticipantManager> _participants = new ArrayList<MockParticipantManager>();
int _replica = 3;
int _minActiveReplica = _replica - 1;
- HelixClusterVerifier _clusterVerifier;
+ ZkHelixClusterVerifier _clusterVerifier;
List<String> _testDBs = new ArrayList<String>();
@BeforeClass
@@ -147,7 +147,7 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
validateDelayedMovements(externalViewsBefore);
Thread.sleep(delay + 200);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
// after delay time, it should maintain required number of replicas.
for (String db : _testDBs) {
ExternalView ev =
@@ -168,8 +168,8 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
CLUSTER_NAME, testDb);
idealState.setDelayRebalanceEnabled(false);
_gSetupTool.getClusterManagementTool().setResourceIdealState(CLUSTER_NAME, testDb, idealState);
- Thread.sleep(1000);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
// once delay rebalance is disabled, it should maintain required number of replicas for that db.
// replica for other dbs should not be moved.
@@ -200,8 +200,8 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
enableDelayRebalanceInCluster(_gZkClient, CLUSTER_NAME, false);
// TODO: remove this once controller is listening on cluster config change.
RebalanceScheduler.invokeRebalance(_controller.getHelixDataAccessor(), _testDBs.get(0));
- Thread.sleep(500);
- Assert.assertTrue(_clusterVerifier.verify());
+ Thread.sleep(100);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
_gSetupTool.getClusterManagementTool().getResourceExternalView(CLUSTER_NAME, db);
@@ -219,7 +219,7 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
String disabledInstanceName = _participants.get(0).getInstanceName();
enableDelayRebalanceInInstance(_gZkClient, CLUSTER_NAME, disabledInstanceName, false);
- Thread.sleep(1000);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
@@ -263,8 +263,8 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
_minActiveReplica, delayTime, CrushRebalanceStrategy.class.getName());
_testDBs.add(db);
}
- Thread.sleep(800);
- Assert.assertTrue(_clusterVerifier.verify());
+ Thread.sleep(100);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
_gSetupTool.getClusterManagementTool().getResourceExternalView(CLUSTER_NAME, db);
@@ -307,8 +307,8 @@ public class TestDelayedAutoRebalance extends ZkTestBase {
throws InterruptedException {
// bring down one node, no partition should be moved.
_participants.get(0).syncStop();
- Thread.sleep(500);
- Assert.assertTrue(_clusterVerifier.verify());
+ Thread.sleep(100);
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
index 0c2b24c..4a89db9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithDisabledInstance.java
@@ -57,7 +57,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
enableInstance(instance, false);
Thread.sleep(300);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -80,7 +80,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
enableInstance(instance, false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -107,7 +107,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable one node, no partition should be moved.
enableInstance(_participants.get(0).getInstanceName(), false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -121,7 +121,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable another node, the minimal active replica for each partition should be maintained.
enableInstance(_participants.get(3).getInstanceName(), false);
Thread.sleep(1000);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -144,7 +144,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable one node, no partition should be moved.
enableInstance(_participants.get(0).getInstanceName(), false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -158,7 +158,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// bring down another node, the minimal active replica for each partition should be maintained.
_participants.get(3).syncStop();
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -183,7 +183,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable one node, no partition should be moved.
enableInstance(_participants.get(0).getInstanceName(), false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
_gSetupTool.getClusterManagementTool().getResourceExternalView(CLUSTER_NAME, db);
@@ -211,7 +211,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable one node, no partition should be moved.
enableInstance(_participants.get(0).getInstanceName(), false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -229,7 +229,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
idealState.setDelayRebalanceEnabled(false);
_gSetupTool.getClusterManagementTool().setResourceIdealState(CLUSTER_NAME, testDb, idealState);
Thread.sleep(2000);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
// once delay rebalance is disabled, it should maintain required number of replicas for that db.
// replica for other dbs should not be moved.
@@ -259,7 +259,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// disable one node, no partition should be moved.
enableInstance(_participants.get(0).getInstanceName(), false);
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
@@ -275,7 +275,7 @@ public class TestDelayedAutoRebalanceWithDisabledInstance extends TestDelayedAut
// TODO: remove this once controller is listening on cluster config change.
RebalanceScheduler.invokeRebalance(_controller.getHelixDataAccessor(), _testDBs.get(0));
Thread.sleep(2000);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
ExternalView ev =
_gSetupTool.getClusterManagementTool().getResourceExternalView(CLUSTER_NAME, db);
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
index 2c096f5..f768684 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/DelayedAutoRebalancer/TestDelayedAutoRebalanceWithRackaware.java
@@ -20,17 +20,11 @@ package org.apache.helix.integration.rebalancer.DelayedAutoRebalancer;
*/
import java.util.Date;
-import java.util.List;
-import java.util.Map;
import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
-import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
import org.apache.helix.integration.manager.ClusterControllerManager;
import org.apache.helix.integration.manager.MockParticipantManager;
-import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
-import org.apache.helix.tools.ClusterSetup;
import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
-import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
index 134ab14..4083988 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestExpandCluster.java
@@ -43,7 +43,7 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
@Test
public void testClusterExpansion() throws Exception {
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
_migrationVerifier.start();
@@ -56,7 +56,7 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
Thread.sleep(50);
}
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
Assert.assertFalse(_migrationVerifier.hasLessReplica());
Assert.assertFalse(_migrationVerifier.hasMoreReplica());
@@ -66,7 +66,7 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
@Test (dependsOnMethods = {"testClusterExpansion"})
public void testClusterExpansionByEnableInstance() throws Exception {
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
_migrationVerifier.reset();
_migrationVerifier.start();
@@ -96,7 +96,7 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
Thread.sleep(100);
}
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
Assert.assertFalse(_migrationVerifier.hasLessReplica());
Assert.assertFalse(_migrationVerifier.hasMoreReplica());
@@ -110,7 +110,7 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
clusterConfig.setRebalanceDelayTime(0);
_configAccessor.setClusterConfig(CLUSTER_NAME, clusterConfig);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
_migrationVerifier.reset();
_migrationVerifier.start();
@@ -121,10 +121,10 @@ public class TestExpandCluster extends TestPartitionMigrationBase {
MockParticipantManager participant = _participants.get(i);
participant.syncStop();
_gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, storageNodeName, false);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
}
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
Assert.assertFalse(_migrationVerifier.hasLessMinActiveReplica());
Assert.assertFalse(_migrationVerifier.hasMoreReplica());
http://git-wip-us.apache.org/repos/asf/helix/blob/4609d944/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
index 8dfe195..98dcbb6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/PartitionMigration/TestFullAutoMigration.java
@@ -25,15 +25,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.helix.ConfigAccessor;
-import org.apache.helix.HelixDataAccessor;
import org.apache.helix.controller.rebalancer.strategy.CrushRebalanceStrategy;
-import org.apache.helix.controller.rebalancer.util.RebalanceScheduler;
import org.apache.helix.integration.manager.MockParticipantManager;
-import org.apache.helix.manager.zk.ZKHelixDataAccessor;
import org.apache.helix.model.BuiltInStateModelDefinitions;
-import org.apache.helix.model.ExternalView;
import org.apache.helix.model.IdealState;
-import org.apache.helix.model.InstanceConfig;
import org.apache.helix.model.ResourceConfig;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -99,7 +94,7 @@ public class TestFullAutoMigration extends TestPartitionMigrationBase {
Thread.sleep(50);
}
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
_migrationVerifier =
new MigrationStateVerifier(Collections.singletonMap(db, idealState), _manager);
@@ -113,7 +108,7 @@ public class TestFullAutoMigration extends TestPartitionMigrationBase {
}
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
Assert.assertFalse(_migrationVerifier.hasLessReplica());
Assert.assertFalse(_migrationVerifier.hasMoreReplica());
@@ -140,7 +135,7 @@ public class TestFullAutoMigration extends TestPartitionMigrationBase {
_testDBs.add(db);
}
Thread.sleep(100);
- Assert.assertTrue(_clusterVerifier.verify());
+ Assert.assertTrue(_clusterVerifier.verifyByPolling());
for (String db : _testDBs) {
IdealState is = _gSetupTool.getClusterManagementTool().getResourceIdealState(CLUSTER_NAME, db);
idealStateMap.put(db, is);