helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [2/2] git commit: Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x
Date Thu, 22 May 2014 18:09:20 GMT
Merge branch 'helix-0.6.x' of https://git-wip-us.apache.org/repos/asf/helix into helix-0.6.x


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/4ff7e388
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/4ff7e388
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/4ff7e388

Branch: refs/heads/helix-0.6.x
Commit: 4ff7e3888561b46ca6d9c590bdf425b0d2e0716b
Parents: efed884 f3b2c4f
Author: Kanak Biscuitwala <kanak@apache.org>
Authored: Thu May 22 11:08:01 2014 -0700
Committer: Kanak Biscuitwala <kanak@apache.org>
Committed: Thu May 22 11:08:01 2014 -0700

----------------------------------------------------------------------
 .../helix/webapp/resources/JsonParameters.java  |   4 +
 .../webapp/resources/ResourceGroupResource.java |   7 +
 .../helix/webapp/TestDisableResource.java       |  84 ++++++
 helix-core/pom.xml                              |  12 +-
 .../main/java/org/apache/helix/GroupCommit.java |  41 +--
 .../main/java/org/apache/helix/HelixAdmin.java  |   7 +
 .../main/java/org/apache/helix/PropertyKey.java |  27 ++
 .../java/org/apache/helix/PropertyType.java     |  12 -
 .../helix/controller/HelixControllerMain.java   |  19 --
 .../controller/rebalancer/AutoRebalancer.java   |   3 +-
 .../controller/rebalancer/CustomRebalancer.java |  17 +-
 .../rebalancer/SemiAutoRebalancer.java          |   3 +-
 .../util/ConstraintBasedAssignment.java         |  20 +-
 .../restlet/ZKPropertyTransferServer.java       | 248 -----------------
 .../controller/restlet/ZNRecordUpdate.java      |  83 ------
 .../restlet/ZNRecordUpdateResource.java         |  77 ------
 .../restlet/ZkPropertyTransferApplication.java  |  45 ----
 .../restlet/ZkPropertyTransferClient.java       | 177 ------------
 .../helix/controller/restlet/package-info.java  |  23 --
 .../stages/BestPossibleStateCalcStage.java      |  10 +-
 .../stages/BestPossibleStateOutput.java         |  39 ++-
 .../controller/stages/ClusterDataCache.java     |  45 +---
 .../stages/ExternalViewComputeStage.java        |  14 +-
 .../stages/ResourceComputationStage.java        |   5 +
 .../manager/zk/DistributedLeaderElection.java   |  10 -
 .../manager/zk/ParticipantManagerHelper.java    |   3 -
 .../apache/helix/manager/zk/ZKHelixAdmin.java   |  84 ++++--
 .../helix/manager/zk/ZKHelixDataAccessor.java   |  73 +----
 .../apache/helix/manager/zk/ZKHelixManager.java |  14 +-
 .../manager/zk/ZNRecordStreamingSerializer.java |   6 +-
 .../messaging/handling/HelixTaskExecutor.java   | 117 ++++----
 .../java/org/apache/helix/model/IdealState.java |  20 +-
 .../helix/monitoring/ZKPathDataDumpTask.java    | 173 ++++++------
 .../monitoring/mbeans/ClusterStatusMonitor.java | 174 ++++++++++--
 .../monitoring/mbeans/InstanceMonitor.java      |   4 +-
 .../mbeans/PerInstanceResourceMonitor.java      | 146 ++++++++++
 .../mbeans/PerInstanceResourceMonitorMBean.java |  34 +++
 .../monitoring/mbeans/ResourceMonitor.java      |  21 +-
 .../participant/HelixCustomCodeRunner.java      |  20 +-
 .../org/apache/helix/tools/ClusterSetup.java    |  17 +-
 .../stages/TestMessageThrottleStage.java        |   2 +-
 .../strategy/TestAutoRebalanceStrategy.java     |   2 +-
 .../helix/integration/TestAutoRebalance.java    |   2 +-
 .../TestAutoRebalancePartitionLimit.java        |   2 +-
 .../TestCustomizedIdealStateRebalancer.java     |   2 +-
 .../TestDisableCustomCodeRunner.java            | 252 +++++++++++++++++
 .../helix/integration/TestDisableNode.java      |   2 +-
 .../helix/integration/TestDisablePartition.java |   2 +-
 .../helix/integration/TestDisableResource.java  | 268 +++++++++++++++++++
 .../org/apache/helix/integration/TestDrop.java  | 125 ++++++++-
 .../helix/integration/TestDropResource.java     |   2 +-
 .../integration/TestHelixCustomCodeRunner.java  |  41 +--
 .../helix/integration/TestMessagingService.java |   4 +-
 .../helix/integration/TestSchedulerMessage.java |  22 +-
 .../integration/TestZkCallbackHandlerLeak.java  |  77 +++---
 ...dAloneCMTestBaseWithPropertyServerCheck.java |  88 ------
 .../manager/MockParticipantManager.java         |   1 -
 .../manager/TestConsecutiveZkSessionExpiry.java |   4 +-
 .../TestDistributedControllerManager.java       |   4 +-
 .../manager/TestZkCallbackHandlerLeak.java      |  76 +++---
 .../manager/zk/TestLiveInstanceBounce.java      |   4 +-
 .../zk/TestZKPropertyTransferServer.java        |  65 -----
 .../helix/manager/zk/TestZkHelixAdmin.java      |  32 ++-
 .../manager/zk/TestZkStateChangeListener.java   |   4 +-
 .../helix/mock/participant/MockJobIntf.java     |  28 --
 .../mock/participant/MockMSModelFactory.java    |   2 -
 .../TestClusterStatusMonitorLifecycle.java      |  40 ++-
 .../monitoring/TestParticipantMonitor.java      |   6 +-
 .../helix/monitoring/TestStatCollector.java     |   6 +-
 .../monitoring/TestZKPathDataDumpTask.java      | 113 ++++++++
 .../mbeans/TestClusterStatusMonitor.java        | 210 +++++++++------
 .../monitoring/mbeans/TestResourceMonitor.java  | 127 +++------
 .../apache/helix/tools/TestClusterSetup.java    |  36 ++-
 pom.xml                                         |   5 +
 74 files changed, 1973 insertions(+), 1621 deletions(-)
----------------------------------------------------------------------



Mime
View raw message