You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/10/25 03:35:29 UTC
[1/2] git commit: [HELIX-273] Rebalancer interface should remain
unchanged in 0.6.2, add test assert, rb=14915
Updated Branches:
refs/heads/helix-0.6.2-release 002acfd64 -> 5c7721970
[HELIX-273] Rebalancer interface should remain unchanged in 0.6.2, add test assert, rb=14915
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/74483638
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/74483638
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/74483638
Branch: refs/heads/helix-0.6.2-release
Commit: 74483638eb3257d8104a401b8521dc7e40a5c56d
Parents: 610b28b
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Oct 24 15:49:59 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Oct 24 18:35:03 2013 -0700
----------------------------------------------------------------------
.../helix/integration/TestCustomizedIdealStateRebalancer.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/74483638/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java b/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
index 4575def..f4c3c35 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
@@ -45,6 +45,7 @@ public class TestCustomizedIdealStateRebalancer extends
ZkStandAloneCMTestBaseWithPropertyServerCheck {
String db2 = TEST_DB + "2";
static boolean testRebalancerCreated = false;
+ static boolean testRebalancerInvoked = false;
public static class TestRebalancer implements Rebalancer {
@@ -56,6 +57,7 @@ public class TestCustomizedIdealStateRebalancer extends
@Override
public IdealState computeNewIdealState(String resourceName, IdealState currentIdealState,
CurrentStateOutput currentStateOutput, ClusterDataCache clusterData) {
+ testRebalancerInvoked = true;
for (String partition : currentIdealState.getPartitionSet()) {
String instance = currentIdealState.getPreferenceList(partition).get(0);
currentIdealState.getPreferenceList(partition).clear();
@@ -99,6 +101,7 @@ public class TestCustomizedIdealStateRebalancer extends
Assert.assertEquals(is.getInstanceStateMap(partition).size(), 3);
}
Assert.assertTrue(testRebalancerCreated);
+ Assert.assertTrue(testRebalancerInvoked);
}
public static class ExternalViewBalancedVerifier implements ZkVerifier {
[2/2] git commit: Merge branch 'helix-0.6.2-release' of
https://git-wip-us.apache.org/repos/asf/incubator-helix into
helix-0.6.2-release
Posted by ka...@apache.org.
Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/incubator-helix into helix-0.6.2-release
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/5c772197
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/5c772197
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/5c772197
Branch: refs/heads/helix-0.6.2-release
Commit: 5c7721970eef78e2d13d35b4934b07cb11a03cd9
Parents: 7448363 002acfd
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Oct 24 18:35:16 2013 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Oct 24 18:35:16 2013 -0700
----------------------------------------------------------------------
.../tools/TestHelixAdminScenariosRest.java | 889 +++++++++------
.../apache/helix/tools/TestResetInstance.java | 21 +-
.../helix/tools/TestResetPartitionState.java | 24 +-
.../apache/helix/tools/TestResetResource.java | 22 +-
.../org/apache/helix/agent/TestHelixAgent.java | 29 +-
.../java/org/apache/helix/HelixManager.java | 13 +-
.../java/org/apache/helix/HelixProperty.java | 7 +-
.../helix/manager/zk/AbstractManager.java | 693 ------------
.../helix/manager/zk/ControllerManager.java | 175 ---
.../manager/zk/ControllerManagerHelper.java | 6 +-
.../zk/DistributedControllerManager.java | 190 ----
.../manager/zk/DistributedLeaderElection.java | 16 +-
.../helix/manager/zk/ParticipantManager.java | 155 ---
.../manager/zk/ParticipantManagerHelper.java | 27 +-
.../apache/helix/manager/zk/ZKHelixManager.java | 1039 +++++++++---------
.../helix/manager/zk/ZkAsyncCallbacks.java | 3 +-
.../helix/manager/zk/ZkStateChangeListener.java | 127 ---
.../src/test/java/org/apache/helix/Mocks.java | 6 +
.../test/java/org/apache/helix/TestHelper.java | 101 +-
.../apache/helix/TestShuffledIdealState.java | 68 +-
.../org/apache/helix/TestZkClientWrapper.java | 45 +-
.../java/org/apache/helix/TestZnodeModify.java | 3 +-
.../org/apache/helix/ZkHelixTestManager.java | 44 -
.../controller/stages/DummyClusterManager.java | 6 +
.../stages/TestParseInfoFromAlert.java | 18 +-
.../stages/TestRebalancePipeline.java | 17 +-
.../helix/healthcheck/TestAddDropAlert.java | 35 +-
.../healthcheck/TestAlertActionTriggering.java | 21 +-
.../helix/healthcheck/TestAlertFireHistory.java | 37 +-
.../helix/healthcheck/TestDummyAlerts.java | 14 +-
.../helix/healthcheck/TestExpandAlert.java | 40 +-
.../helix/healthcheck/TestSimpleAlert.java | 40 +-
.../healthcheck/TestSimpleWildcardAlert.java | 42 +-
.../helix/healthcheck/TestStalenessAlert.java | 36 +-
.../helix/healthcheck/TestWildcardAlert.java | 36 +-
.../helix/integration/TestAddClusterV2.java | 80 +-
.../TestAddNodeAfterControllerStart.java | 58 +-
.../TestAddStateModelFactoryAfterConnect.java | 17 +-
.../integration/TestAutoIsWithEmptyMap.java | 14 +-
.../helix/integration/TestAutoRebalance.java | 66 +-
.../TestAutoRebalancePartitionLimit.java | 87 +-
.../helix/integration/TestBatchMessage.java | 50 +-
.../integration/TestBatchMessageWrapper.java | 18 +-
.../integration/TestBucketizedResource.java | 15 +-
.../integration/TestCarryOverBadCurState.java | 19 +-
.../integration/TestCleanupExternalView.java | 20 +-
.../helix/integration/TestClusterStartsup.java | 15 +-
.../helix/integration/TestCustomIdealState.java | 12 -
.../TestCustomizedIdealStateRebalancer.java | 4 +-
.../apache/helix/integration/TestDisable.java | 36 +-
.../helix/integration/TestDisableNode.java | 2 +-
.../helix/integration/TestDisablePartition.java | 2 +-
.../integration/TestDistributedCMMain.java | 18 +-
.../TestDistributedClusterController.java | 18 +-
.../apache/helix/integration/TestDriver.java | 75 +-
.../org/apache/helix/integration/TestDrop.java | 85 +-
.../helix/integration/TestDropResource.java | 9 +-
.../TestEnablePartitionDuringDisable.java | 22 +-
.../helix/integration/TestErrorPartition.java | 28 +-
.../integration/TestExternalViewUpdates.java | 21 +-
.../integration/TestHelixCustomCodeRunner.java | 42 +-
.../helix/integration/TestHelixInstanceTag.java | 3 +-
.../helix/integration/TestInstanceAutoJoin.java | 25 +-
.../integration/TestInvalidAutoIdealState.java | 14 +-
.../TestMessagePartitionStateMismatch.java | 4 +-
.../helix/integration/TestMessageThrottle.java | 22 +-
.../helix/integration/TestMessageThrottle2.java | 4 +-
.../helix/integration/TestMessagingService.java | 81 +-
.../integration/TestNonOfflineInitState.java | 27 +-
.../helix/integration/TestNullReplica.java | 15 +-
.../TestParticipantErrorMessage.java | 14 +-
.../TestParticipantNameCollision.java | 9 +-
.../helix/integration/TestPauseSignal.java | 15 +-
.../helix/integration/TestRenamePartition.java | 47 +-
.../helix/integration/TestResetInstance.java | 18 +-
.../integration/TestResetPartitionState.java | 17 +-
.../helix/integration/TestResetResource.java | 18 +-
.../integration/TestRestartParticipant.java | 41 +-
.../helix/integration/TestSchedulerMessage.java | 76 +-
.../helix/integration/TestSchemataSM.java | 14 +-
.../TestSessionExpiryInTransition.java | 27 +-
.../helix/integration/TestStandAloneCMMain.java | 40 +-
.../TestStandAloneCMSessionExpiry.java | 21 +-
...estStartMultipleControllersWithSameName.java | 9 +-
.../integration/TestStateTransitionTimeout.java | 40 +-
.../helix/integration/TestSwapInstance.java | 16 +-
.../integration/TestZkCallbackHandlerLeak.java | 88 +-
.../integration/ZkIntegrationTestBase.java | 49 +-
.../integration/ZkStandAloneCMTestBase.java | 63 +-
...dAloneCMTestBaseWithPropertyServerCheck.java | 25 +-
.../manager/ClusterControllerManager.java | 17 +-
.../manager/ClusterDistributedController.java | 20 +-
.../manager/MockParticipantManager.java | 8 +-
.../manager/TestConsecutiveZkSessionExpiry.java | 1 -
.../TestDistributedControllerManager.java | 9 +-
.../manager/TestParticipantManager.java | 26 +-
.../apache/helix/josql/TestJosqlProcessor.java | 8 +-
.../TestDefaultControllerMsgHandlerFactory.java | 9 +-
.../helix/manager/zk/TestHandleNewSession.java | 17 +-
.../manager/zk/TestLiveInstanceBounce.java | 22 +-
.../zk/TestZKPropertyTransferServer.java | 20 +-
.../helix/manager/zk/TestZkClusterManager.java | 9 +-
.../apache/helix/manager/zk/TestZkFlapping.java | 14 +-
.../zk/TestZkManagerFlappingDetection.java | 117 +-
.../manager/zk/TestZkStateChangeListener.java | 54 +-
.../handling/TestConfigThreadpoolSize.java | 10 +-
.../handling/TestResourceThreadpoolSize.java | 8 +-
.../mock/controller/ClusterController.java | 129 ---
.../MockHealthReportParticipant.java | 16 +-
.../helix/mock/participant/MockParticipant.java | 197 ----
.../helix/participant/MockZKHelixManager.java | 6 +
.../TestDistControllerStateModel.java | 12 +-
.../apache/helix/tools/TestHelixAdminCli.java | 162 +--
113 files changed, 2480 insertions(+), 4131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/5c772197/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
----------------------------------------------------------------------