helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swaroop...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Sat, 06 Apr 2013 00:31:21 GMT
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/f3e32551
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/f3e32551
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/f3e32551

Branch: refs/heads/master
Commit: f3e32551094e4edfd73364e3c79e3aba980a8208
Parents: ec8000e 6ffeb30
Author: Swaroop Jagadish <sjagadis@sjagadis-ld.linkedin.biz>
Authored: Fri Apr 5 17:30:58 2013 -0700
Committer: Swaroop Jagadish <sjagadis@sjagadis-ld.linkedin.biz>
Committed: Fri Apr 5 17:30:58 2013 -0700

----------------------------------------------------------------------
 README.md                                          |  120 +--
 helix-admin-webapp/pom.xml                         |    1 -
 helix-admin-webapp/src/assemble/assembly.xml       |   28 +-
 .../src/main/config/log4j.properties               |   25 +-
 .../apache/helix/webapp/RestAdminApplication.java  |    3 +
 .../helix/webapp/resources/ConfigResource.java     |    6 +-
 .../helix/webapp/resources/ConstraintResource.java |  158 ++
 .../helix/webapp/resources/IdealStateResource.java |   14 +-
 .../helix/webapp/resources/InstanceResource.java   |   20 +
 .../helix/webapp/resources/InstancesResource.java  |   21 +-
 .../helix/webapp/resources/JsonParameters.java     |   57 +-
 .../webapp/resources/ResourceGroupsResource.java   |   31 +-
 .../webapp/resources/SchedulerTasksResource.java   |   18 +-
 helix-admin-webapp/src/main/webapp/WEB-INF/web.xml |   28 +-
 helix-admin-webapp/src/main/webapp/index.jsp       |   25 +-
 helix-admin-webapp/src/test/conf/testng.xml        |   27 +-
 .../helix/tools/TestHelixAdminScenariosRest.java   |   80 +
 .../org/apache/helix/tools/TestResetInstance.java  |    2 +-
 .../helix/tools/TestResetPartitionState.java       |    2 +-
 .../org/apache/helix/tools/TestResetResource.java  |    2 +-
 .../helix/webapp/TestClusterManagementWebapp.java  |   29 +-
 .../org/apache/helix/ClusterMessagingService.java  |   13 +
 .../main/java/org/apache/helix/ConfigAccessor.java |   92 +-
 .../org/apache/helix/ConfigChangeListener.java     |    1 +
 .../main/java/org/apache/helix/ConfigScope.java    |  149 --
 .../java/org/apache/helix/ConfigScopeBuilder.java  |  137 --
 .../java/org/apache/helix/ExternalCommand.java     |  401 +++++
 .../src/main/java/org/apache/helix/HelixAdmin.java |   98 +-
 .../main/java/org/apache/helix/HelixConstants.java |    5 +-
 .../java/org/apache/helix/HelixDataAccessor.java   |   17 +-
 .../java/org/apache/helix/HelixDefinedState.java   |   43 +
 .../main/java/org/apache/helix/HelixManager.java   |   28 +-
 .../java/org/apache/helix/HelixManagerFactory.java |    3 +-
 .../main/java/org/apache/helix/HelixProperty.java  |   12 +-
 .../apache/helix/InstanceConfigChangeListener.java |   35 +
 .../org/apache/helix/LiveInstanceInfoProvider.java |   31 +
 .../java/org/apache/helix/NotificationContext.java |    8 +-
 .../main/java/org/apache/helix/PropertyKey.java    |  108 +-
 .../java/org/apache/helix/PropertyPathConfig.java  |    8 +-
 .../apache/helix/ScopedConfigChangeListener.java   |   33 +
 .../helix/controller/ExternalViewGenerator.java    |   36 +-
 .../helix/controller/GenericHelixController.java   |  148 +-
 .../helix/controller/HelixControllerMain.java      |    3 +-
 .../helix/controller/rebalancer/Rebalancer.java    |   55 +
 .../stages/BestPossibleStateCalcStage.java         |   66 +-
 .../controller/stages/BestPossibleStateOutput.java |    4 +
 .../helix/controller/stages/ClusterDataCache.java  |   72 +-
 .../stages/CurrentStateComputationStage.java       |    2 +-
 .../stages/ExternalViewComputeStage.java           |  170 ++-
 .../controller/stages/MessageGenerationOutput.java |    8 +-
 .../controller/stages/MessageGenerationPhase.java  |   66 +-
 .../controller/stages/MessageThrottleStage.java    |    2 +-
 .../controller/stages/ReadClusterDataStage.java    |    6 +-
 .../stages/RebalanceIdealStateStage.java           |   79 +
 .../stages/ResourceComputationStage.java           |    4 +-
 .../controller/stages/TaskAssignmentStage.java     |    6 +-
 .../healthcheck/HealthStatsAggregationTask.java    |    4 +-
 .../helix/josql/ClusterJosqlQueryProcessor.java    |    2 +-
 .../java/org/apache/helix/manager/zk/Cache.java    |    5 +-
 .../apache/helix/manager/zk/CallbackHandler.java   |  216 ++-
 .../helix/manager/zk/CurStateCarryOverUpdater.java |   72 +
 .../zk/DefaultSchedulerMessageHandlerFactory.java  |  123 ++-
 .../apache/helix/manager/zk/WriteThroughCache.java |   22 +-
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |  263 +++-
 .../helix/manager/zk/ZKHelixDataAccessor.java      |   11 -
 .../apache/helix/manager/zk/ZKHelixManager.java    |  557 ++++---
 .../java/org/apache/helix/manager/zk/ZKUtil.java   |   42 +-
 .../helix/manager/zk/ZkBaseDataAccessor.java       |    5 +-
 .../helix/manager/zk/ZkCacheBaseDataAccessor.java  |    2 +
 .../apache/helix/manager/zk/ZkCallbackCache.java   |   11 +-
 .../java/org/apache/helix/manager/zk/ZkClient.java |   14 +-
 .../helix/manager/zk/ZkStateChangeListener.java    |   45 +-
 .../org/apache/helix/messaging/AsyncCallback.java  |    7 +
 .../helix/messaging/DefaultMessagingService.java   |    6 +-
 .../messaging/handling/BatchMessageHandler.java    |  233 +++
 .../messaging/handling/BatchMessageWrapper.java    |   34 +
 .../messaging/handling/CurrentStateUpdate.java     |   40 +
 .../messaging/handling/HelixBatchMessageTask.java  |  121 ++
 .../handling/HelixStateTransitionHandler.java      |  197 ++-
 .../apache/helix/messaging/handling/HelixTask.java |  249 ++--
 .../messaging/handling/HelixTaskExecutor.java      |  377 +++--
 .../helix/messaging/handling/HelixTaskResult.java  |    2 +-
 .../helix/messaging/handling/MessageTask.java      |   36 +
 .../helix/messaging/handling/MessageTaskInfo.java  |   41 +
 .../messaging/handling/MessageTimeoutTask.java     |   50 +
 .../helix/messaging/handling/TaskExecutor.java     |   92 +
 .../org/apache/helix/model/ClusterConstraints.java |  164 +--
 .../java/org/apache/helix/model/ConfigScope.java   |  155 ++
 .../org/apache/helix/model/ConstraintItem.java     |  101 ++
 .../java/org/apache/helix/model/IdealState.java    |   94 +-
 .../org/apache/helix/model/InstanceConfig.java     |   80 +-
 .../main/java/org/apache/helix/model/Message.java  |    3 +-
 .../apache/helix/model/StateModelDefinition.java   |   55 +-
 .../helix/model/builder/AutoModeISBuilder.java     |   50 +
 .../model/builder/AutoRebalanceModeISBuilder.java  |   49 +
 .../model/builder/ClusterConstraintsBuilder.java   |   73 +
 .../helix/model/builder/ConfigScopeBuilder.java    |  138 ++
 .../helix/model/builder/ConstraintItemBuilder.java |  111 ++
 .../helix/model/builder/CustomModeISBuilder.java   |   66 +
 .../helix/model/builder/IdealStateBuilder.java     |  167 ++
 .../model/builder/StateTransitionTableBuilder.java |  205 +++
 .../helix/monitoring/mbeans/ResourceMonitor.java   |    3 +-
 .../participant/GenericLeaderStandbyModel.java     |   27 +-
 .../helix/participant/HelixStateMachineEngine.java |  110 +-
 .../statemachine/ScheduledTaskStateModel.java      |  127 ++
 .../ScheduledTaskStateModelFactory.java            |   43 +
 .../helix/participant/statemachine/StateModel.java |   15 +-
 .../statemachine/StateModelFactory.java            |   69 +-
 .../participant/statemachine/StateModelParser.java |    6 +-
 .../statemachine/StateTransitionTableBuilder.java  |  204 ---
 .../java/org/apache/helix/tools/ClusterSetup.java  |  402 ++++--
 .../apache/helix/tools/ClusterStateVerifier.java   |   26 +-
 .../tools/IdealCalculatorByConsistentHashing.java  |   20 +-
 .../helix/tools/IdealStateCalculatorByRush.java    |   18 +-
 .../tools/IdealStateCalculatorByShuffling.java     |   14 +-
 .../helix/tools/StateModelConfigGenerator.java     |   72 +-
 .../main/java/org/apache/helix/util/HelixUtil.java |   69 +-
 .../java/org/apache/helix/util/ZKClientPool.java   |   65 +
 .../resources/cluster-manager-version.properties   |   25 +-
 .../java/org/apache/helix/ExternalCommand.java     |  400 -----
 .../src/test/java/org/apache/helix/Mocks.java      |   64 +-
 .../java/org/apache/helix/TestConfigAccessor.java  |  131 +-
 .../org/apache/helix/TestHelixTaskExecutor.java    |   16 +-
 .../org/apache/helix/TestHelixTaskHandler.java     |    4 +-
 .../src/test/java/org/apache/helix/TestHelper.java |  103 +-
 .../org/apache/helix/TestListenerCallback.java     |  133 ++
 .../java/org/apache/helix/TestRoutingTable.java    |    9 +-
 .../java/org/apache/helix/ZkHelixTestManager.java  |   44 +
 .../test/java/org/apache/helix/ZkTestHelper.java   |  214 +++-
 .../test/java/org/apache/helix/ZkUnitTestBase.java |    7 +-
 .../controller/stages/DummyClusterManager.java     |   28 +-
 .../stages/TestMessageThrottleStage.java           |    2 +-
 .../healthcheck/TestAlertActionTriggering.java     |    5 +-
 .../helix/healthcheck/TestAlertFireHistory.java    |   51 +-
 .../TestAddNodeAfterControllerStart.java           |   46 +-
 .../TestAddStateModelFactoryAfterConnect.java      |   39 +-
 .../helix/integration/TestAutoRebalance.java       |   54 +-
 .../TestAutoRebalancePartitionLimit.java           |  271 +++
 .../apache/helix/integration/TestBatchMessage.java |  298 ++++
 .../helix/integration/TestBatchMessageWrapper.java |  135 ++
 .../integration/TestCarryOverBadCurState.java      |    1 +
 .../helix/integration/TestCleanupExternalView.java |  124 ++
 .../TestCustomizedIdealStateRebalancer.java        |  212 +++
 .../org/apache/helix/integration/TestDrop.java     |  215 +++-
 .../helix/integration/TestErrorPartition.java      |    2 +-
 .../apache/helix/integration/TestGroupMessage.java |  213 ---
 .../helix/integration/TestHelixInstanceTag.java    |  100 ++
 .../helix/integration/TestInstanceAutoJoin.java    |   85 +
 .../integration/TestInvalidAutoIdealState.java     |  127 ++
 .../helix/integration/TestMessageThrottle.java     |   20 +-
 .../helix/integration/TestNonOfflineInitState.java |    2 +-
 .../helix/integration/TestResetInstance.java       |    2 +-
 .../helix/integration/TestResetPartitionState.java |    2 +-
 .../helix/integration/TestResetResource.java       |    2 +-
 .../helix/integration/TestSchedulerMessage.java    |  603 +++++++-
 .../apache/helix/integration/TestSchemataSM.java   |    2 +-
 .../integration/TestSessionExpiryInTransition.java |    8 +-
 .../integration/TestStandAloneCMSessionExpiry.java |   12 +-
 .../TestStartMultipleControllersWithSameName.java  |    3 +-
 .../integration/TestStateTransitionTimeout.java    |    7 +-
 .../integration/TestZkCallbackHandlerLeak.java     |  217 +++
 .../helix/integration/ZkIntegrationTestBase.java   |    4 +-
 .../helix/manager/zk/TestLiveInstanceBounce.java   |   14 +-
 .../org/apache/helix/manager/zk/TestZKUtil.java    |    5 +-
 .../manager/zk/TestZkCacheAsyncOpSingleThread.java |   14 +-
 .../manager/zk/TestZkCacheSyncOpSingleThread.java  |   20 +-
 .../helix/manager/zk/TestZkClusterManager.java     |  134 ++-
 .../apache/helix/manager/zk/TestZkHelixAdmin.java  |  123 ++-
 .../manager/zk/TestZkManagerFlappingDetection.java |  194 +++
 .../manager/zk/TestZkStateChangeListener.java      |   99 ++
 .../handling/TestConfigThreadpoolSize.java         |   17 +-
 .../messaging/handling/TestHelixTaskExecutor.java  |   41 +-
 .../handling/TestResourceThreadpoolSize.java       |    7 +-
 .../helix/mock/controller/ClusterController.java   |   18 +-
 .../helix/mock/participant/ErrTransition.java      |   69 +
 .../participant/MockBootstrapModelFactory.java     |   34 +
 .../mock/participant/MockBootstrapStateModel.java  |   65 +
 .../helix/mock/participant/MockMSModelFactory.java |   57 +
 .../helix/mock/participant/MockMSStateModel.java   |  130 ++
 .../helix/mock/participant/MockParticipant.java    |  398 +-----
 .../mock/participant/MockSchemataModelFactory.java |   33 +
 .../mock/participant/MockSchemataStateModel.java   |   58 +
 .../helix/mock/participant/SleepTransition.java    |   40 +
 .../participant/StoreAccessDiffNodeTransition.java |   86 +
 .../participant/StoreAccessOneNodeTransition.java  |   82 +
 .../org/apache/helix/model/TestConstraint.java     |    1 -
 .../org/apache/helix/model/TestIdealState.java     |   28 +-
 .../org/apache/helix/model/TestInstanceConfig.java |   38 +
 .../helix/model/builder/TestIdealStateBuilder.java |   90 +
 .../helix/participant/MockZKHelixManager.java      |   29 +-
 .../statemachine/TestStateModelParser.java         |   93 ++
 .../helix/store/zk/TestZkHelixPropertyStore.java   |   36 +-
 .../org/apache/helix/tools/TestClusterSetup.java   |   24 +-
 .../org/apache/helix/tools/TestHelixAdminCli.java  | 1288 +++++++++------
 .../org/apache/helix/util/TestZKClientPool.java    |    2 +-
 helix-core/src/test/resources/log4j.properties     |    2 +-
 mockservice/header.txt                             |   13 -
 mockservice/src/main/config/log4j.properties       |   29 +-
 mockservice/src/test/conf/testng.xml               |   27 +-
 pom.xml                                            |  112 ++-
 recipes/distributed-lock-manager/pom.xml           |    3 +-
 recipes/rsync-replicated-file-system/pom.xml       |    3 +-
 .../apache/helix/filestore/ChangeLogGenerator.java |    2 +-
 .../apache/helix/filestore/IntegrationTest.java    |    6 +-
 src/site/apt/privacy-policy.apt                    |   52 +
 .../apt/releasenotes/release-0.6.0-incubating.apt  |   11 +-
 src/site/apt/releasing.apt                         |    4 +-
 src/site/markdown/ApiUsage.md                      |  283 ----
 src/site/markdown/Architecture.md                  |    6 +-
 src/site/markdown/Features.md                      |   38 +-
 src/site/markdown/Quickstart.md                    |   92 +-
 src/site/markdown/Tutorial.md                      |  334 ++++
 src/site/markdown/UseCases.md                      |    4 +-
 src/site/markdown/index.md                         |  167 ++-
 .../markdown/recipes/rabbitmq_consumer_group.md    |   53 +-
 src/site/resources/.htaccess                       |   20 +
 src/site/resources/download.cgi                    |   22 +
 src/site/site.xml                                  |   52 +-
 src/site/xdoc/download.xml.vm                      |  191 +++
 219 files changed, 12629 insertions(+), 4632 deletions(-)
----------------------------------------------------------------------



Mime
View raw message