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/03/20 00:16:29 UTC
helix git commit: [HELIX-679] consolidate semantics of recursively
delete path in ZkClient
Repository: helix
Updated Branches:
refs/heads/master 07e05a4c1 -> 0e8490353
[HELIX-679] consolidate semantics of recursively delete path in ZkClient
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/0e849035
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/0e849035
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/0e849035
Branch: refs/heads/master
Commit: 0e849035379a04b079ac1274bb8aaab473df1572
Parents: 07e05a4
Author: hrzhang <hr...@linkedin.com>
Authored: Thu Mar 8 14:04:42 2018 -0800
Committer: Harry Zhang <zh...@usc.edu>
Committed: Mon Mar 19 16:43:31 2018 -0700
----------------------------------------------------------------------
.../helix/webapp/resources/ZkChildResource.java | 2 +-
.../helix/webapp/resources/ZkPathResource.java | 4 +-
.../helix/manager/zk/ParticipantManager.java | 2 +-
.../apache/helix/manager/zk/ZKHelixAdmin.java | 8 ++--
.../org/apache/helix/manager/zk/ZKUtil.java | 2 +-
.../helix/manager/zk/zookeeper/ZkClient.java | 44 +++++++++++++++++---
.../java/org/apache/helix/tools/ZKDumper.java | 2 +-
.../test/java/org/apache/helix/TestHelper.java | 4 +-
.../apache/helix/TestHierarchicalDataStore.java | 2 +-
.../java/org/apache/helix/TestZKCallback.java | 2 +-
.../java/org/apache/helix/TestZnodeModify.java | 2 +-
.../helix/integration/TestAddClusterV2.java | 4 +-
.../TestAlertingRebalancerFailure.java | 2 +-
.../helix/integration/TestClusterStartsup.java | 8 ++--
.../integration/TestDisableExternalView.java | 2 +-
.../apache/helix/integration/TestDriver.java | 2 +-
.../TestPartitionMovementThrottle.java | 2 +-
.../TestRebalancerPersistAssignments.java | 2 +-
.../TestStateTransitionCancellation.java | 2 +-
.../helix/integration/TestZkConnectionLost.java | 2 +-
.../common/ZkStandAloneCMTestBase.java | 2 +-
.../paticipant/TestNonOfflineInitState.java | 2 +-
.../paticipant/TestStateTransitionTimeout.java | 2 +-
.../TestStateTransitionTimeoutWithResource.java | 2 +-
.../TestCrushAutoRebalance.java | 2 +-
.../TestCrushAutoRebalanceNonRack.java | 2 +-
...rushAutoRebalanceTopoplogyAwareDisabled.java | 2 +-
.../TestDelayedAutoRebalance.java | 2 +-
.../TestDelayedAutoRebalanceWithRackaware.java | 2 +-
.../rebalancer/TestAutoRebalance.java | 2 +-
.../TestAutoRebalancePartitionLimit.java | 2 +-
...MaintenanceModeWhenReachingMaxPartition.java | 2 +-
...ceModeWhenReachingOfflineInstancesLimit.java | 2 +-
.../rebalancer/TestMixedModeAutoRebalance.java | 2 +-
.../rebalancer/TestSemiAutoRebalance.java | 2 +-
.../rebalancer/TestZeroReplicaAvoidance.java | 2 +-
.../TestGenericTaskAssignmentCalculator.java | 2 +-
.../task/TestIndependentTaskRebalancer.java | 2 +-
.../helix/integration/task/TestJobFailure.java | 2 +-
.../task/TestJobFailureHighThreshold.java | 2 +-
.../task/TestJobFailureTaskNotStarted.java | 2 +-
.../helix/integration/task/TestJobTimeout.java | 2 +-
.../task/TestJobTimeoutTaskNotStarted.java | 2 +-
.../task/TestRebalanceRunningTask.java | 2 +-
.../integration/task/TestUserContentStore.java | 2 +-
.../manager/zk/TestZKLiveInstanceData.java | 2 +-
.../org/apache/helix/manager/zk/TestZKUtil.java | 2 +-
.../manager/zk/TestZkBaseDataAccessor.java | 2 +-
.../apache/helix/manager/zk/TestZkClient.java | 2 +-
.../helix/manager/zk/TestZkClusterManager.java | 4 +-
.../helix/manager/zk/TestZkHelixAdmin.java | 4 +-
.../participant/TestDistControllerElection.java | 6 +--
.../TestDistControllerStateModel.java | 2 +-
.../store/zk/TestZkHelixPropertyStore.java | 2 +-
.../helix/task/TaskSynchronizedTestBase.java | 2 +-
.../helix/task/TestSemiAutoStateTransition.java | 2 +-
.../apache/helix/tools/TestClusterSetup.java | 6 +--
57 files changed, 110 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
index cbc5225..967536d 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkChildResource.java
@@ -114,7 +114,7 @@ public class ZkChildResource extends ServerResource {
if (childNames != null) {
for (String childName : childNames) {
String childPath = zkPath.equals("/") ? "/" + childName : zkPath + "/" + childName;
- zkClient.deleteRecursive(childPath);
+ zkClient.deleteRecursively(childPath);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
----------------------------------------------------------------------
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
index 4a4136f..30ffba1 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ZkPathResource.java
@@ -75,7 +75,7 @@ public class ZkPathResource extends ServerResource {
if (childNames != null) {
for (String childName : childNames) {
String childPath = zkPath.equals("/") ? "/" + childName : zkPath + "/" + childName;
- zkClient.deleteRecursive(childPath);
+ zkClient.deleteRecursively(childPath);
}
}
} else {
@@ -148,7 +148,7 @@ public class ZkPathResource extends ServerResource {
try {
ZkClient zkClient =
(ZkClient) getContext().getAttributes().get(RestAdminApplication.ZKCLIENT);
- zkClient.deleteRecursive(zkPath);
+ zkClient.deleteRecursively(zkPath);
getResponse().setStatus(Status.SUCCESS_OK);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
index 572e367..880607a 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
@@ -327,7 +327,7 @@ public class ParticipantManager {
String path = _keyBuilder.currentStates(_instanceName, session).getPath();
LOG.info("Removing current states from previous sessions. path: " + path);
- _zkclient.deleteRecursive(path);
+ _zkclient.deleteRecursively(path);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
index 546352c..9e44797 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
@@ -147,7 +147,7 @@ public class ZKHelixAdmin implements HelixAdmin {
ZKUtil.dropChildren(_zkClient, instanceConfigsPath, instanceConfig.getRecord());
// delete instance path
- _zkClient.deleteRecursive(instancePath);
+ _zkClient.deleteRecursively(instancePath);
}
@Override
@@ -553,7 +553,7 @@ public class ZKHelixAdmin implements HelixAdmin {
if (_zkClient.exists(root)) {
if (recreateIfExists) {
logger.warn("Root directory exists.Cleaning the root directory:" + root);
- _zkClient.deleteRecursive(root);
+ _zkClient.deleteRecursively(root);
} else {
logger.info("Cluster " + clusterName + " already exists");
return true;
@@ -807,7 +807,7 @@ public class ZKHelixAdmin implements HelixAdmin {
if (recreateIfExists) {
logger.info(
"Operation.State Model directory exists:" + stateModelPath + ", remove and recreate.");
- _zkClient.deleteRecursive(stateModelPath);
+ _zkClient.deleteRecursively(stateModelPath);
} else {
logger.info("Skip the operation. State Model directory exists:" + stateModelPath);
return;
@@ -862,7 +862,7 @@ public class ZKHelixAdmin implements HelixAdmin {
throw new HelixException("There are still LEADER in the cluster, shut them down first.");
}
- _zkClient.deleteRecursive(root);
+ _zkClient.deleteRecursively(root);
}
@Override
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
index 6677552..d6a54f5 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKUtil.java
@@ -150,7 +150,7 @@ public final class ZKUtil {
// TODO: check if parentPath exists
String id = nodeRecord.getId();
String temp = parentPath + "/" + id;
- client.deleteRecursive(temp);
+ client.deleteRecursively(temp);
}
public static List<ZNRecord> getChildren(ZkClient client, String path) {
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
index 8e0a379..45c397a 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/zookeeper/ZkClient.java
@@ -746,21 +746,49 @@ public class ZkClient implements Watcher {
return false;
}
+ /**
+ * Delete the path as well as all its children.
+ * This method is deprecated, please use {@link #deleteRecursively(String)}} instead
+ * @param path ZK path
+ * @return true if successfully deleted all children, and the given path, else false
+ */
+ @Deprecated
public boolean deleteRecursive(String path) {
+ try {
+ deleteRecursively(path);
+ return true;
+ } catch (HelixException e) {
+ LOG.error("Failed to recursively delete path " + path, e);
+ return false;
+ }
+ }
+
+ /**
+ * Delete the path as well as all its children.
+ * @param path
+ * @throws HelixException
+ */
+ public void deleteRecursively(String path) throws HelixException {
List<String> children;
try {
children = getChildren(path, false);
} catch (ZkNoNodeException e) {
- return true;
+ // if the node to be deleted does not exist, treat it as success.
+ return;
}
for (String subPath : children) {
- if (!deleteRecursive(path + "/" + subPath)) {
- return false;
- }
+ deleteRecursively(path + "/" + subPath);
}
- return delete(path);
+ // delete() function call will return true if successful, false if the path does not
+ // exist (in this context, it should be treated as successful), and throw exception
+ // if there is any other failure case.
+ try {
+ delete(path);
+ } catch (Exception e) {
+ throw new HelixException("Failed to delete " + path, e);
+ }
}
private void processDataOrChildChange(WatchedEvent event) {
@@ -982,6 +1010,12 @@ public class ZkClient implements Watcher {
return _zkEventLock;
}
+ /**
+ * Delete the given path. Path should not have any children or the deletion will fail.
+ * This function will throw exception if we fail to delete an existing path
+ * @param path
+ * @return true if path is successfully deleted, false if path does not exist
+ */
public boolean delete(final String path) {
long startT = System.currentTimeMillis();
boolean success;
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/main/java/org/apache/helix/tools/ZKDumper.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/tools/ZKDumper.java b/helix-core/src/main/java/org/apache/helix/tools/ZKDumper.java
index 729ccad..6fb50ff 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/ZKDumper.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/ZKDumper.java
@@ -158,7 +158,7 @@ public class ZKDumper {
}
private void delete(String zkPath) {
- client.deleteRecursive(zkPath);
+ client.deleteRecursively(zkPath);
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/TestHelper.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestHelper.java b/helix-core/src/test/java/org/apache/helix/TestHelper.java
index 9d8d5ed..0bd7c35 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHelper.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHelper.java
@@ -265,7 +265,7 @@ public class TestHelper {
ZkClient zkClient = new ZkClient(ZkAddr);
if (zkClient.exists("/" + clusterName)) {
LOG.warn("Cluster already exists:" + clusterName + ". Deleting it");
- zkClient.deleteRecursive("/" + clusterName);
+ zkClient.deleteRecursively("/" + clusterName);
}
ClusterSetup setupTool = new ClusterSetup(ZkAddr);
@@ -290,7 +290,7 @@ public class TestHelper {
public static void dropCluster(String clusterName, ZkClient zkClient) throws Exception {
if (!zkClient.exists("/" + clusterName)) {
LOG.warn("Cluster does not exist:" + clusterName + ". Deleting it");
- zkClient.deleteRecursive("/" + clusterName);
+ zkClient.deleteRecursively("/" + clusterName);
}
ClusterSetup setupTool = new ClusterSetup(zkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/TestHierarchicalDataStore.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestHierarchicalDataStore.java b/helix-core/src/test/java/org/apache/helix/TestHierarchicalDataStore.java
index dbe8154..fd4560a 100644
--- a/helix-core/src/test/java/org/apache/helix/TestHierarchicalDataStore.java
+++ b/helix-core/src/test/java/org/apache/helix/TestHierarchicalDataStore.java
@@ -38,7 +38,7 @@ public class TestHierarchicalDataStore extends ZkUnitTestBase {
FileFilter filter = null;
// _zkClient.setZkSerializer(new ZNRecordSerializer());
- _zkClientString.deleteRecursive(path);
+ _zkClientString.deleteRecursively(path);
HierarchicalDataHolder<ZNRecord> dataHolder =
new HierarchicalDataHolder<ZNRecord>(_zkClientString, path, filter);
dataHolder.print();
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestZKCallback.java b/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
index 96439ab..2bb111a 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZKCallback.java
@@ -210,7 +210,7 @@ public class TestZKCallback extends ZkUnitTestBase {
_zkClient = new ZkClient(ZK_ADDR);
_zkClient.setZkSerializer(new ZNRecordSerializer());
if (_zkClient.exists("/" + clusterName)) {
- _zkClient.deleteRecursive("/" + clusterName);
+ _zkClient.deleteRecursively("/" + clusterName);
}
ClusterSetup.processCommandLineArgs(createArgs("-zkSvr " + ZK_ADDR + " -addCluster "
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java b/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
index f63efab..a42f242 100644
--- a/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
+++ b/helix-core/src/test/java/org/apache/helix/TestZnodeModify.java
@@ -240,7 +240,7 @@ public class TestZnodeModify extends ZkUnitTestBase {
_zkClient = new ZkClient(ZK_ADDR);
_zkClient.setZkSerializer(new ZNRecordSerializer());
if (_zkClient.exists(PREFIX)) {
- _zkClient.deleteRecursive(PREFIX);
+ _zkClient.deleteRecursively(PREFIX);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
index 71ba337..8be880d 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAddClusterV2.java
@@ -56,13 +56,13 @@ public class TestAddClusterV2 extends ZkIntegrationTestBase {
String namespace = "/" + CONTROLLER_CLUSTER;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
for (int i = 0; i < CLUSTER_NR; i++) {
namespace = "/" + CLUSTER_PREFIX + "_" + CLASS_NAME + "_" + i;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java b/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
index 012760c..946eb1c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestAlertingRebalancerFailure.java
@@ -70,7 +70,7 @@ public class TestAlertingRebalancerFailure extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
// setup storage cluster
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java b/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
index ffeb189..21a9ac2 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestClusterStartsup.java
@@ -40,7 +40,7 @@ public class TestClusterStartsup extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
@@ -69,7 +69,7 @@ public class TestClusterStartsup extends ZkStandAloneCMTestBase {
public void testParticipantStartUp() throws Exception {
setupCluster();
String controllerMsgPath = PropertyPathBuilder.controllerMessage(CLUSTER_NAME);
- _gZkClient.deleteRecursive(controllerMsgPath);
+ _gZkClient.deleteRecursively(controllerMsgPath);
HelixManager manager = null;
try {
@@ -102,7 +102,7 @@ public class TestClusterStartsup extends ZkStandAloneCMTestBase {
setupCluster();
String stateModelPath = PropertyPathBuilder.stateModelDef(CLUSTER_NAME);
- _gZkClient.deleteRecursive(stateModelPath);
+ _gZkClient.deleteRecursively(stateModelPath);
try {
manager =
@@ -120,7 +120,7 @@ public class TestClusterStartsup extends ZkStandAloneCMTestBase {
setupCluster();
String instanceStatusUpdatePath =
PropertyPathBuilder.instanceStatusUpdate(CLUSTER_NAME, "localhost_" + (START_PORT + 1));
- _gZkClient.deleteRecursive(instanceStatusUpdatePath);
+ _gZkClient.deleteRecursively(instanceStatusUpdatePath);
try {
manager =
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java b/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
index a17f987..f4deef9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDisableExternalView.java
@@ -69,7 +69,7 @@ public class TestDisableExternalView extends ZkIntegrationTestBase {
_admin = new ZKHelixAdmin(_gZkClient);
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
// setup storage cluster
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestDriver.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestDriver.java b/helix-core/src/test/java/org/apache/helix/integration/TestDriver.java
index 0a96f8b..73af2bb 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestDriver.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestDriver.java
@@ -126,7 +126,7 @@ public class TestDriver {
if (zkClient.exists("/" + clusterName)) {
LOG.warn("test cluster already exists:" + clusterName + ", test name:" + uniqClusterName
+ " is not unique or test has been run without cleaning up zk; deleting it");
- zkClient.deleteRecursive("/" + clusterName);
+ zkClient.deleteRecursively("/" + clusterName);
}
if (_testInfoMap.containsKey(uniqClusterName)) {
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
index 68f678c..d37f9cf 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestPartitionMovementThrottle.java
@@ -62,7 +62,7 @@ public class TestPartitionMovementThrottle extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java b/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
index b7b139f..debd923 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestRebalancerPersistAssignments.java
@@ -52,7 +52,7 @@ public class TestRebalancerPersistAssignments extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
// setup storage cluster
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
index 364fd08..1549d4f 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestStateTransitionCancellation.java
@@ -63,7 +63,7 @@ public class TestStateTransitionCancellation extends TaskTestBase {
_numReplicas = 2;
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 3e130a7..8327697 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
@@ -39,7 +39,7 @@ public class TestZkConnectionLost extends TaskTestBase {
_participants = new MockParticipantManager[_numNodes];
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 0c95a02..4027984 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
@@ -67,7 +67,7 @@ public class ZkStandAloneCMTestBase extends ZkIntegrationTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 0e39d7a..bd9e168 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
@@ -90,7 +90,7 @@ public class TestNonOfflineInitState extends ZkIntegrationTestBase {
int nodesNb, int replica, String stateModelDef, boolean doRebalance) throws Exception {
if (_gZkClient.exists("/" + clusterName)) {
LOG.warn("Cluster already exists:" + clusterName + ". Deleting it");
- _gZkClient.deleteRecursive("/" + clusterName);
+ _gZkClient.deleteRecursively("/" + clusterName);
}
ClusterSetup setupTool = new ClusterSetup(ZkAddr);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 0fd3a2c..438050d 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
@@ -62,7 +62,7 @@ public class TestStateTransitionTimeout extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 50a5970..b7491f2 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
@@ -72,7 +72,7 @@ public class TestStateTransitionTimeoutWithResource extends ZkStandAloneCMTestBa
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 08608f3..0b90af6 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
@@ -74,7 +74,7 @@ public class TestCrushAutoRebalance extends ZkIntegrationTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 85059b6..42ce528 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
@@ -65,7 +65,7 @@ public class TestCrushAutoRebalanceNonRack extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
index 55245e7..c7d88e9 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/CrushRebalancers/TestCrushAutoRebalanceTopoplogyAwareDisabled.java
@@ -35,7 +35,7 @@ public class TestCrushAutoRebalanceTopoplogyAwareDisabled extends TestCrushAutoR
String namespace = "/" + CLUSTER_NAME;
if (ZkIntegrationTestBase._gZkClient.exists(namespace)) {
- ZkIntegrationTestBase._gZkClient.deleteRecursive(namespace);
+ ZkIntegrationTestBase._gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZkIntegrationTestBase._gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 817c207..76f64b2 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
@@ -66,7 +66,7 @@ public class TestDelayedAutoRebalance extends ZkIntegrationTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/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 7d98f27..116a756 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
@@ -43,7 +43,7 @@ public class TestDelayedAutoRebalanceWithRackaware extends TestDelayedAutoRebala
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
index 0254e04..0619359 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalance.java
@@ -57,7 +57,7 @@ public class TestAutoRebalance extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
index ec327ed..a53b6c6 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestAutoRebalancePartitionLimit.java
@@ -56,7 +56,7 @@ public class TestAutoRebalancePartitionLimit extends ZkStandAloneCMTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
index 58036f0..9769021 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingMaxPartition.java
@@ -60,7 +60,7 @@ public class TestClusterInMaintenanceModeWhenReachingMaxPartition extends ZkInte
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_gSetupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
index e03ee14..eaac6bc 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit.java
@@ -72,7 +72,7 @@ public class TestClusterInMaintenanceModeWhenReachingOfflineInstancesLimit
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_gSetupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
index d2f4013..dcbd7e1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestMixedModeAutoRebalance.java
@@ -84,7 +84,7 @@ public class TestMixedModeAutoRebalance extends ZkIntegrationTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_gSetupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
index a849246..3eb0e57 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestSemiAutoRebalance.java
@@ -63,7 +63,7 @@ public class TestSemiAutoRebalance extends ZkIntegrationTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
// setup storage cluster
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
index f3aad7b..e1bfa82 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/rebalancer/TestZeroReplicaAvoidance.java
@@ -64,7 +64,7 @@ public class TestZeroReplicaAvoidance extends ZkIntegrationTestBase implements
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(_gZkClient);
_setupTool.addCluster(CLUSTER_NAME, true);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
index 64d0f1f..5aa7dbe 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestGenericTaskAssignmentCalculator.java
@@ -62,7 +62,7 @@ public class TestGenericTaskAssignmentCalculator extends TaskTestBase {
_participants = new MockParticipantManager[_numNodes];
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
// Setup cluster and instances
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
index b050c0c..28d182b 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestIndependentTaskRebalancer.java
@@ -66,7 +66,7 @@ public class TestIndependentTaskRebalancer extends TaskTestBase {
_participants = new MockParticipantManager[_numNodes];
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
// Setup cluster and instances
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
index e79106e..79c085e 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailure.java
@@ -60,7 +60,7 @@ public final class TestJobFailure extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureHighThreshold.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureHighThreshold.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureHighThreshold.java
index 4ebc373..9e67d46 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureHighThreshold.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureHighThreshold.java
@@ -56,7 +56,7 @@ public class TestJobFailureHighThreshold extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
index d287352..d1f8250 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobFailureTaskNotStarted.java
@@ -73,7 +73,7 @@ public class TestJobFailureTaskNotStarted extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
index 3002b80..e6f2116 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeout.java
@@ -53,7 +53,7 @@ public final class TestJobTimeout extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
index f965101..9521e4c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestJobTimeoutTaskNotStarted.java
@@ -64,7 +64,7 @@ public class TestJobTimeoutTaskNotStarted extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
index 53c22e5..7fb3042 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestRebalanceRunningTask.java
@@ -59,7 +59,7 @@ public final class TestRebalanceRunningTask extends TaskSynchronizedTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java b/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
index 731b346..0f3ab51 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/task/TestUserContentStore.java
@@ -57,7 +57,7 @@ public class TestUserContentStore extends TaskTestBase {
_participants = new MockParticipantManager[_numNodes];
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
// Setup cluster and instances
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
index 0044630..9546d59 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKLiveInstanceData.java
@@ -113,7 +113,7 @@ public class TestZKLiveInstanceData extends ZkUnitTestBase {
zkClient = new ZkClient(ZK_ADDR);
zkClient.setZkSerializer(new ZNRecordSerializer());
if (zkClient.exists("/" + clusterName)) {
- zkClient.deleteRecursive("/" + clusterName);
+ zkClient.deleteRecursively("/" + clusterName);
}
} finally {
if (zkClient != null) {
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
index a2d3f1d..c2373c0 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZKUtil.java
@@ -47,7 +47,7 @@ public class TestZKUtil extends ZkUnitTestBase {
_zkClient = new ZkClient(ZK_ADDR);
_zkClient.setZkSerializer(new ZNRecordSerializer());
if (_zkClient.exists("/" + clusterName)) {
- _zkClient.deleteRecursive("/" + clusterName);
+ _zkClient.deleteRecursively("/" + clusterName);
}
boolean result = ZKUtil.isClusterSetup(clusterName, _zkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
index 943b0a7..021fb39 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkBaseDataAccessor.java
@@ -366,7 +366,7 @@ public class TestZkBaseDataAccessor extends ZkUnitTestBase {
String root = "TestZkBaseDataAccessor_asyn";
ZkClient zkClient = new ZkClient(ZK_ADDR);
zkClient.setZkSerializer(new ZNRecordSerializer());
- zkClient.deleteRecursive("/" + root);
+ zkClient.deleteRecursively("/" + root);
ZkBaseDataAccessor<ZNRecord> accessor = new ZkBaseDataAccessor<ZNRecord>(zkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClient.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClient.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClient.java
index 9993b14..276c8d8 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClient.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClient.java
@@ -70,7 +70,7 @@ public class TestZkClient extends ZkUnitTestBase {
@Test()
void testGetStat() {
String path = "/tmp/getStatTest";
- _zkClient.deleteRecursive(path);
+ _zkClient.deleteRecursively(path);
Stat stat, newStat;
stat = _zkClient.getStat(path);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
index 6e68d1a..88725b9 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkClusterManager.java
@@ -60,7 +60,7 @@ public class TestZkClusterManager extends ZkUnitTestBase {
// basic test
if (_gZkClient.exists("/" + clusterName)) {
- _gZkClient.deleteRecursive("/" + clusterName);
+ _gZkClient.deleteRecursively("/" + clusterName);
}
ZKHelixManager controller =
@@ -232,7 +232,7 @@ public class TestZkClusterManager extends ZkUnitTestBase {
// basic test
if (_gZkClient.exists("/" + clusterName)) {
- _gZkClient.deleteRecursive("/" + clusterName);
+ _gZkClient.deleteRecursively("/" + clusterName);
}
ZKHelixManager admin =
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
index 852bb87..4ce13ed 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkHelixAdmin.java
@@ -75,7 +75,7 @@ public class TestZkHelixAdmin extends ZkUnitTestBase {
final String clusterName = getShortClassName();
String rootPath = "/" + clusterName;
if (_gZkClient.exists(rootPath)) {
- _gZkClient.deleteRecursive(rootPath);
+ _gZkClient.deleteRecursively(rootPath);
}
HelixAdmin tool = new ZKHelixAdmin(_gZkClient);
@@ -414,7 +414,7 @@ public class TestZkHelixAdmin extends ZkUnitTestBase {
final String clusterName = getShortClassName();
String rootPath = "/" + clusterName;
if (_gZkClient.exists(rootPath)) {
- _gZkClient.deleteRecursive(rootPath);
+ _gZkClient.deleteRecursively(rootPath);
}
HelixAdmin tool = new ZKHelixAdmin(_gZkClient);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerElection.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerElection.java b/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerElection.java
index 40f933b..90990ee 100644
--- a/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerElection.java
+++ b/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerElection.java
@@ -55,7 +55,7 @@ public class TestDistControllerElection extends ZkUnitTestBase {
final String clusterName = CLUSTER_PREFIX + "_" + className + "_" + "testController";
String path = "/" + clusterName;
if (_gZkClient.exists(path)) {
- _gZkClient.deleteRecursive(path);
+ _gZkClient.deleteRecursively(path);
}
ZKHelixDataAccessor accessor =
@@ -108,7 +108,7 @@ public class TestDistControllerElection extends ZkUnitTestBase {
CONTROLLER_CLUSTER_PREFIX + "_" + className + "_" + "testControllerParticipant";
String path = "/" + clusterName;
if (_gZkClient.exists(path)) {
- _gZkClient.deleteRecursive(path);
+ _gZkClient.deleteRecursively(path);
}
ZKHelixDataAccessor accessor =
@@ -167,7 +167,7 @@ public class TestDistControllerElection extends ZkUnitTestBase {
final String clusterName = CLUSTER_PREFIX + "_" + className + "_" + "testParticipant";
String path = "/" + clusterName;
if (_gZkClient.exists(path)) {
- _gZkClient.deleteRecursive(path);
+ _gZkClient.deleteRecursively(path);
}
TestHelper.setupEmptyCluster(_gZkClient, clusterName);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java b/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java
index df67baf..689c51b 100644
--- a/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java
+++ b/helix-core/src/test/java/org/apache/helix/participant/TestDistControllerStateModel.java
@@ -40,7 +40,7 @@ public class TestDistControllerStateModel extends ZkUnitTestBase {
public void beforeMethod() {
stateModel = new DistClusterControllerStateModel(ZK_ADDR);
if (_gZkClient.exists("/" + clusterName)) {
- _gZkClient.deleteRecursive("/" + clusterName);
+ _gZkClient.deleteRecursively("/" + clusterName);
}
TestHelper.setupEmptyCluster(_gZkClient, clusterName);
}
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
index 4abada2..8cfff65 100644
--- a/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
+++ b/helix-core/src/test/java/org/apache/helix/store/zk/TestZkHelixPropertyStore.java
@@ -246,7 +246,7 @@ public class TestZkHelixPropertyStore extends ZkUnitTestBase {
// test delete callbacks
listener.reset();
int expectDeleteNodes = 1 + firstLevelNr + firstLevelNr * secondLevelNr;
- _gZkClient.deleteRecursive(subRoot);
+ _gZkClient.deleteRecursively(subRoot);
Thread.sleep(1000);
System.out.println("createKey#:" + listener._createKeys.size() + ", changeKey#:"
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
index e8c7b0d..c377233 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TaskSynchronizedTestBase.java
@@ -63,7 +63,7 @@ public class TaskSynchronizedTestBase extends ZkIntegrationTestBase {
_participants = new MockParticipantManager[_numNodes];
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
index a6537db..2f75c09 100644
--- a/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
+++ b/helix-core/src/test/java/org/apache/helix/task/TestSemiAutoStateTransition.java
@@ -49,7 +49,7 @@ public class TestSemiAutoStateTransition extends TaskTestBase {
String namespace = "/" + CLUSTER_NAME;
if (_gZkClient.exists(namespace)) {
- _gZkClient.deleteRecursive(namespace);
+ _gZkClient.deleteRecursively(namespace);
}
_setupTool = new ClusterSetup(ZK_ADDR);
http://git-wip-us.apache.org/repos/asf/helix/blob/0e849035/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java b/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
index 4f69436..a959127 100644
--- a/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
+++ b/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
@@ -86,7 +86,7 @@ public class TestClusterSetup extends ZkUnitTestBase {
@BeforeMethod()
public void setup() {
- _zkClient.deleteRecursive("/" + CLUSTER_NAME);
+ _zkClient.deleteRecursively("/" + CLUSTER_NAME);
_clusterSetup = new ClusterSetup(ZK_ADDR);
_clusterSetup.addCluster(CLUSTER_NAME, true);
}
@@ -240,14 +240,14 @@ public class TestClusterSetup extends ZkUnitTestBase {
// .processCommandLineArgs(createArgs("-zkSvr "+ZK_ADDR+ " help"));
// wipe ZK
- _zkClient.deleteRecursive("/" + CLUSTER_NAME);
+ _zkClient.deleteRecursively("/" + CLUSTER_NAME);
_clusterSetup = new ClusterSetup(ZK_ADDR);
ClusterSetup.processCommandLineArgs(createArgs("-zkSvr " + ZK_ADDR + " --addCluster "
+ CLUSTER_NAME));
// wipe again
- _zkClient.deleteRecursive("/" + CLUSTER_NAME);
+ _zkClient.deleteRecursively("/" + CLUSTER_NAME);
_clusterSetup = new ClusterSetup(ZK_ADDR);
_clusterSetup.setupTestCluster(CLUSTER_NAME);