You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ki...@apache.org on 2013/11/20 22:12:27 UTC
[12/52] [abbrv] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-helix
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/00ff8c06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/00ff8c06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/00ff8c06
Branch: refs/heads/helix-yarn
Commit: 00ff8c06c3402c205a56945552e6a6cc57bfec3b
Parents: 0cb3775 ebd37fe
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Mon Nov 11 14:09:44 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Mon Nov 11 14:09:44 2013 -0800
----------------------------------------------------------------------
.../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 | 27 +-
.../java/org/apache/helix/HelixManager.java | 7 +
.../java/org/apache/helix/HelixProperty.java | 6 +-
.../rebalancer/SemiAutoRebalancer.java | 3 +
.../util/ConstraintBasedAssignment.java | 55 +-
.../stages/BestPossibleStateCalcStage.java | 64 +-
.../stages/CurrentStateComputationStage.java | 13 +-
.../stages/MessageGenerationStage.java | 2 +-
.../stages/MessageSelectionStage.java | 9 +-
.../controller/stages/MessageThrottleStage.java | 11 +-
.../controller/stages/ResourceCurrentState.java | 13 +-
.../controller/stages/TaskAssignmentStage.java | 12 +-
.../helix/manager/zk/AbstractManager.java | 691 ------------
.../helix/manager/zk/ControllerManager.java | 174 ---
.../manager/zk/ControllerManagerHelper.java | 7 +-
.../DefaultSchedulerMessageHandlerFactory.java | 1 +
.../zk/DistributedControllerManager.java | 190 ----
.../manager/zk/DistributedLeaderElection.java | 16 +-
.../manager/zk/HelixConnectionAdaptor.java | 6 +
.../helix/manager/zk/ParticipantManager.java | 153 ---
.../manager/zk/ParticipantManagerHelper.java | 27 +-
.../apache/helix/manager/zk/ZKHelixManager.java | 1041 +++++++++---------
.../helix/manager/zk/ZkAsyncCallbacks.java | 3 +-
.../helix/manager/zk/ZkStateChangeListener.java | 127 ---
.../messaging/DefaultMessagingService.java | 4 +-
.../apache/helix/model/ResourceAssignment.java | 19 +-
.../src/test/java/org/apache/helix/Mocks.java | 6 +
.../test/java/org/apache/helix/TestHelper.java | 97 +-
.../org/apache/helix/TestZkClientWrapper.java | 45 +-
.../java/org/apache/helix/TestZnodeModify.java | 3 +-
.../org/apache/helix/ZkHelixTestManager.java | 44 -
.../org/apache/helix/api/TestNewStages.java | 12 +-
.../controller/stages/DummyClusterManager.java | 6 +
.../stages/TestMessageThrottleStage.java | 30 +-
.../stages/TestParseInfoFromAlert.java | 5 +-
.../stages/TestRebalancePipeline.java | 19 +-
.../strategy/TestShufflingTwoStateStrategy.java | 68 +-
.../helix/healthcheck/TestAddDropAlert.java | 35 +-
.../healthcheck/TestAlertActionTriggering.java | 21 +-
.../helix/healthcheck/TestAlertFireHistory.java | 38 +-
.../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 | 78 +-
.../TestAddNodeAfterControllerStart.java | 56 +-
.../TestAddStateModelFactoryAfterConnect.java | 14 +-
.../integration/TestAutoIsWithEmptyMap.java | 14 +-
.../helix/integration/TestAutoRebalance.java | 64 +-
.../TestAutoRebalancePartitionLimit.java | 102 +-
.../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 | 80 +-
.../org/apache/helix/integration/TestDrop.java | 150 ++-
.../helix/integration/TestDropResource.java | 9 +-
.../TestEnablePartitionDuringDisable.java | 22 +-
.../helix/integration/TestErrorPartition.java | 28 +-
.../integration/TestExternalViewUpdates.java | 21 +-
.../integration/TestHelixCustomCodeRunner.java | 40 +-
.../helix/integration/TestHelixInstanceTag.java | 3 +-
.../helix/integration/TestInstanceAutoJoin.java | 25 +-
.../integration/TestInvalidAutoIdealState.java | 14 +-
.../TestMessagePartitionStateMismatch.java | 4 +-
.../helix/integration/TestMessageThrottle.java | 16 +-
.../helix/integration/TestMessageThrottle2.java | 4 +-
.../helix/integration/TestMessagingService.java | 81 +-
.../integration/TestNonOfflineInitState.java | 28 +-
.../helix/integration/TestNullReplica.java | 15 +-
.../TestParticipantErrorMessage.java | 14 +-
.../TestParticipantNameCollision.java | 9 +-
.../helix/integration/TestPauseSignal.java | 15 +-
.../integration/TestRedefineStateModelDef.java | 13 +-
.../helix/integration/TestRenamePartition.java | 45 +-
.../helix/integration/TestResetInstance.java | 18 +-
.../integration/TestResetPartitionState.java | 17 +-
.../helix/integration/TestResetResource.java | 18 +-
.../integration/TestRestartParticipant.java | 41 +-
.../helix/integration/TestSchedulerMessage.java | 586 +++++++---
.../integration/TestSchedulerMsgContraints.java | 254 -----
.../integration/TestSchedulerMsgUsingQueue.java | 181 ---
.../helix/integration/TestSchemataSM.java | 14 +-
.../TestSessionExpiryInTransition.java | 29 +-
.../helix/integration/TestStandAloneCMMain.java | 40 +-
.../TestStandAloneCMSessionExpiry.java | 22 +-
...estStartMultipleControllersWithSameName.java | 9 +-
.../integration/TestStateTransitionTimeout.java | 38 +-
.../helix/integration/TestSwapInstance.java | 16 +-
.../integration/TestZkCallbackHandlerLeak.java | 89 +-
.../integration/ZkIntegrationTestBase.java | 49 +-
.../integration/ZkStandAloneCMTestBase.java | 63 +-
...dAloneCMTestBaseWithPropertyServerCheck.java | 25 +-
.../manager/ClusterControllerManager.java | 17 +-
.../manager/ClusterDistributedController.java | 20 +-
.../manager/MockParticipantManager.java | 8 +-
.../TestDistributedControllerManager.java | 9 +-
.../manager/TestParticipantManager.java | 26 +-
.../apache/helix/josql/TestJosqlProcessor.java | 8 +-
.../TestDefaultControllerMsgHandlerFactory.java | 9 +-
.../helix/manager/zk/TestHandleNewSession.java | 16 +-
.../manager/zk/TestLiveInstanceBounce.java | 20 +-
.../zk/TestZKPropertyTransferServer.java | 21 +-
.../helix/manager/zk/TestZkClusterManager.java | 16 +-
.../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 | 127 ---
.../MockHealthReportParticipant.java | 16 +-
.../helix/mock/participant/MockParticipant.java | 181 ---
.../helix/participant/MockZKHelixManager.java | 6 +
.../TestDistControllerStateModel.java | 13 +-
.../apache/helix/tools/TestHelixAdminCli.java | 162 +--
.../helix/userdefinedrebalancer/Lock.java | 5 +
131 files changed, 3175 insertions(+), 4684 deletions(-)
----------------------------------------------------------------------