Temporary disable batch enable/disable API feature
Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/2f3a56f7 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/2f3a56f7 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/2f3a56f7 Branch: refs/heads/master Commit: 2f3a56f73eb8d184c9d371a74ee2e195a6372b72 Parents: de2e3e8 Author: Junkai Xue <[email protected]> Authored: Thu Nov 16 12:18:39 2017 -0800 Committer: Junkai Xue <[email protected]> Committed: Wed Jan 24 18:31:48 2018 -0800 ---------------------------------------------------------------------- .../org/apache/helix/manager/zk/ZKHelixAdmin.java | 14 ++++++++++++-- .../helix/integration/TestBatchEnableInstances.java | 8 ++++---- 2 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/2f3a56f7/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 1af881e..546352c 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 @@ -195,13 +195,18 @@ public class ZKHelixAdmin implements HelixAdmin { final boolean enabled) { BaseDataAccessor<ZNRecord> baseAccessor = new ZkBaseDataAccessor<>(_zkClient); enableSingleInstance(clusterName, instanceName, enabled, baseAccessor); - enableBatchInstances(clusterName, Collections.singletonList(instanceName), enabled, - baseAccessor); + // TODO: Reenable this after storage node bug fixed. + // enableBatchInstances(clusterName, Collections.singletonList(instanceName), enabled, baseAccessor); + } @Override public void enableInstance(String clusterName, List<String> instances, boolean enabled) { + // TODO: Reenable this after storage node bug fixed. + if (true) { + throw new HelixException("Current batch enable/disable instances are temporarily disabled!"); + } BaseDataAccessor<ZNRecord> baseAccessor = new ZkBaseDataAccessor<>(_zkClient); if (enabled) { for (String instance : instances) { @@ -1296,6 +1301,11 @@ public class ZKHelixAdmin implements HelixAdmin { private void enableBatchInstances(final String clusterName, final List<String> instances, final boolean enabled, BaseDataAccessor<ZNRecord> baseAccessor) { + // TODO : Due to Espresso storage node depends on map field. Current disable the feature now + // include tests. + if (true) { + throw new HelixException("Current batch enable/disable instances are temporarily disabled!"); + } String path = PropertyPathBuilder.clusterConfig(clusterName); http://git-wip-us.apache.org/repos/asf/helix/blob/2f3a56f7/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java ---------------------------------------------------------------------- diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java b/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java index eab5c32..1c0a0f3 100644 --- a/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java +++ b/helix-core/src/test/java/org/apache/helix/integration/TestBatchEnableInstances.java @@ -25,7 +25,7 @@ public class TestBatchEnableInstances extends TaskTestBase { _accessor = new ConfigAccessor(_gZkClient); } - @Test + @Test (enabled = false) public void testOldEnableDisable() throws InterruptedException { _gSetupTool.getClusterManagementTool() .enableInstance(CLUSTER_NAME, _participants[0].getInstanceName(), false); @@ -41,7 +41,7 @@ public class TestBatchEnableInstances extends TaskTestBase { .enableInstance(CLUSTER_NAME, _participants[0].getInstanceName(), true); } - @Test + @Test (enabled = false) public void testBatchEnableDisable() throws InterruptedException { _gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, Arrays.asList(_participants[0].getInstanceName(), _participants[1].getInstanceName()), @@ -60,7 +60,7 @@ public class TestBatchEnableInstances extends TaskTestBase { true); } - @Test + @Test (enabled = false) public void testOldDisableBatchEnable() throws InterruptedException { _gSetupTool.getClusterManagementTool() .enableInstance(CLUSTER_NAME, _participants[0].getInstanceName(), false); @@ -83,7 +83,7 @@ public class TestBatchEnableInstances extends TaskTestBase { .enableInstance(CLUSTER_NAME, _participants[0].getInstanceName(), true); } - @Test + @Test (enabled = false) public void testBatchDisableOldEnable() throws InterruptedException { _gSetupTool.getClusterManagementTool().enableInstance(CLUSTER_NAME, Arrays.asList(_participants[0].getInstanceName(), _participants[1].getInstanceName()),
