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 2014/08/07 22:53:20 UTC
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/helix
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/helix
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/8487c71a
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/8487c71a
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/8487c71a
Branch: refs/heads/master
Commit: 8487c71a8d31d31bbd9b26b507a690bb85fcb0f2
Parents: edfc98e d35e29a
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Thu Aug 7 13:51:48 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Thu Aug 7 13:51:48 2014 -0700
----------------------------------------------------------------------
.../apache/helix/webapp/TestResetInstance.java | 9 +-
.../apache/helix/webapp/TestResetResource.java | 9 +-
.../org/apache/helix/agent/AgentStateModel.java | 4 +-
.../helix/agent/AgentStateModelFactory.java | 6 +-
.../api/StateTransitionHandlerFactory.java | 114 +++++
.../org/apache/helix/api/TransitionHandler.java | 106 +++++
.../apache/helix/api/id/StateModelDefId.java | 4 +
.../helix/controller/HelixControllerMain.java | 10 +-
.../helix/manager/zk/CallbackHandler.java | 420 -------------------
.../manager/zk/ParticipantManagerHelper.java | 281 -------------
.../helix/manager/zk/ZkHelixParticipant.java | 5 +-
.../handling/HelixStateTransitionHandler.java | 14 +-
.../helix/participant/CustomCodeInvoker.java | 9 +-
.../DistClusterControllerStateModel.java | 4 +-
.../DistClusterControllerStateModelFactory.java | 8 +-
.../participant/GenericLeaderStandbyModel.java | 7 +-
.../GenericLeaderStandbyStateModelFactory.java | 9 +-
.../participant/HelixCustomCodeRunner.java | 8 +-
.../participant/HelixStateMachineEngine.java | 121 ++----
.../helix/participant/StateMachineEngine.java | 38 +-
.../statemachine/HelixStateModelFactory.java | 118 ------
.../HelixStateModelFactoryAdaptor.java | 36 --
.../statemachine/ScheduledTaskStateModel.java | 34 +-
.../ScheduledTaskStateModelFactory.java | 10 +-
.../participant/statemachine/StateModel.java | 104 -----
.../statemachine/StateModelFactory.java | 116 -----
.../statemachine/StateModelParser.java | 11 +-
.../java/org/apache/helix/task/TaskRunner.java | 6 +-
.../org/apache/helix/task/TaskStateModel.java | 4 +-
.../helix/task/TaskStateModelFactory.java | 6 +-
.../org/apache/helix/tools/ClusterSetup.java | 2 +-
.../org/apache/helix/DummyProcessThread.java | 7 +-
.../src/test/java/org/apache/helix/Mocks.java | 6 +-
.../org/apache/helix/TestHelixTaskExecutor.java | 6 +-
.../org/apache/helix/TestHelixTaskHandler.java | 8 +-
.../test/java/org/apache/helix/TestHelper.java | 29 --
.../TestAddStateModelFactoryAfterConnect.java | 5 +-
.../integration/TestBatchMessageWrapper.java | 10 +-
.../TestCorrectnessOnConnectivityLoss.java | 10 +-
.../TestDistributedClusterController.java | 144 -------
.../helix/integration/TestErrorPartition.java | 14 +-
.../helix/integration/TestHelixConnection.java | 10 +-
.../helix/integration/TestMessageThrottle2.java | 17 +-
.../helix/integration/TestMessagingService.java | 35 +-
.../integration/TestMultiClusterController.java | 144 +++++++
.../integration/TestNonOfflineInitState.java | 3 +-
.../TestPartitionLevelTransitionConstraint.java | 16 +-
.../integration/TestPreferenceListAsQueue.java | 14 +-
.../helix/integration/TestResetInstance.java | 9 +-
.../integration/TestResetPartitionState.java | 9 +-
.../helix/integration/TestResetResource.java | 9 +-
.../helix/integration/TestSchedulerMessage.java | 1 -
.../integration/TestStateTransitionTimeout.java | 21 +-
.../helix/integration/TestZkReconnect.java | 15 +-
.../manager/TestConsecutiveZkSessionExpiry.java | 3 +-
.../TestDistributedControllerManager.java | 203 ---------
.../TestHelixMultiClusterController.java | 204 +++++++++
.../manager/TestParticipantManager.java | 3 +-
.../integration/manager/TestStateModelLeak.java | 48 ++-
.../integration/manager/ZkTestManager.java | 35 --
.../manager/zk/MockMultiClusterController.java | 3 +-
.../helix/manager/zk/MockParticipant.java | 9 +-
.../TestDefaultControllerMsgHandlerFactory.java | 8 +-
.../helix/messaging/TestAsyncCallbackSvc.java | 13 +-
.../helix/mock/participant/DummyProcess.java | 37 +-
.../participant/MockBootstrapModelFactory.java | 8 +-
.../participant/MockBootstrapStateModel.java | 4 +-
.../mock/participant/MockMSModelFactory.java | 12 +-
.../mock/participant/MockMSStateModel.java | 4 +-
.../participant/MockSchemataModelFactory.java | 11 +-
.../participant/MockSchemataStateModel.java | 4 +-
.../org/apache/helix/model/TestConstraint.java | 2 +-
.../helix/participant/MockZKHelixManager.java | 2 +-
.../TestDistControllerStateModelFactory.java | 3 +-
.../statemachine/TestStateModelParser.java | 5 +-
.../apache/helix/examples/BootstrapHandler.java | 17 +-
.../apache/helix/examples/BootstrapProcess.java | 17 +-
.../apache/helix/examples/DummyParticipant.java | 13 +-
.../apache/helix/examples/ExampleProcess.java | 12 +-
.../LeaderStandbyStateModelFactory.java | 11 +-
.../helix/examples/LogicalModelExample.java | 10 +-
.../examples/MasterSlaveStateModelFactory.java | 13 +-
.../OnlineOfflineStateModelFactory.java | 11 +-
.../org/apache/helix/examples/Quickstart.java | 2 +-
.../participant/StatelessServiceStateModel.java | 4 +-
.../StatelessServiceStateModelFactory.java | 6 +-
.../java/org/apache/helix/lockmanager/Lock.java | 4 +-
.../apache/helix/lockmanager/LockFactory.java | 6 +-
.../apache/helix/recipes/rabbitmq/Consumer.java | 6 +-
.../recipes/rabbitmq/ConsumerStateModel.java | 5 +-
.../rabbitmq/ConsumerStateModelFactory.java | 40 --
.../ConsumerStateTransitionHandlerFactory.java | 40 ++
.../helix/filestore/FileStoreStateModel.java | 4 +-
.../filestore/FileStoreStateModelFactory.java | 6 +-
.../helix/taskexecution/TaskStateModel.java | 4 +-
.../taskexecution/TaskStateModelFactory.java | 6 +-
.../helix/userdefinedrebalancer/Lock.java | 4 +-
.../userdefinedrebalancer/LockFactory.java | 6 +-
98 files changed, 1008 insertions(+), 2035 deletions(-)
----------------------------------------------------------------------