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/05/21 02:15:24 UTC

[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

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/e8ad4482
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/e8ad4482
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/e8ad4482

Branch: refs/heads/helix-0.6.x
Commit: e8ad4482fac3310416646479f5029fb25d3e402b
Parents: 2ef8154 77cc651
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Tue May 20 17:12:13 2014 -0700
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Tue May 20 17:12:13 2014 -0700

----------------------------------------------------------------------
 .../apache/helix/HealthStateChangeListener.java |  39 --
 .../main/java/org/apache/helix/HelixAdmin.java  |  28 --
 .../java/org/apache/helix/HelixManager.java     |  18 +-
 .../main/java/org/apache/helix/PropertyKey.java |  61 ---
 .../org/apache/helix/PropertyPathConfig.java    |  13 -
 .../java/org/apache/helix/PropertyType.java     |   6 +-
 .../helix/alerts/AccumulateAggregator.java      |  67 ---
 .../org/apache/helix/alerts/Aggregator.java     |  40 --
 .../java/org/apache/helix/alerts/Alert.java     |  52 --
 .../apache/helix/alerts/AlertComparator.java    |  30 --
 .../org/apache/helix/alerts/AlertParser.java    | 138 -----
 .../org/apache/helix/alerts/AlertProcessor.java | 311 ------------
 .../helix/alerts/AlertValueAndStatus.java       |  42 --
 .../org/apache/helix/alerts/AlertsHolder.java   | 264 ----------
 .../apache/helix/alerts/DecayAggregator.java    |  78 ---
 .../org/apache/helix/alerts/DivideOperator.java |  40 --
 .../org/apache/helix/alerts/ExpandOperator.java |  39 --
 .../helix/alerts/ExpressionOperatorType.java    |  44 --
 .../apache/helix/alerts/ExpressionParser.java   | 496 ------------------
 .../helix/alerts/GreaterAlertComparator.java    |  45 --
 .../apache/helix/alerts/MultiplyOperator.java   |  60 ---
 .../java/org/apache/helix/alerts/Operator.java  | 111 -----
 .../main/java/org/apache/helix/alerts/Stat.java |  44 --
 .../org/apache/helix/alerts/StatsHolder.java    | 310 ------------
 .../apache/helix/alerts/SumEachOperator.java    |  51 --
 .../org/apache/helix/alerts/SumOperator.java    |  59 ---
 .../java/org/apache/helix/alerts/Tuple.java     |  88 ----
 .../apache/helix/alerts/WindowAggregator.java   |  93 ----
 .../org/apache/helix/alerts/package-info.java   |  22 -
 .../controller/GenericHelixController.java      |  66 +--
 .../controller/stages/HealthDataCache.java      |  97 ----
 .../controller/stages/ReadHealthDataStage.java  |  53 --
 .../stages/StatsAggregationStage.java           | 399 ---------------
 .../healthcheck/AccumulateAggregationType.java  |  41 --
 .../helix/healthcheck/AggregationType.java      |  31 --
 .../healthcheck/AggregationTypeFactory.java     |  69 ---
 .../helix/healthcheck/DecayAggregationType.java |  58 ---
 .../DefaultHealthReportProvider.java            |  87 ----
 .../helix/healthcheck/DefaultPerfCounters.java  |  95 ----
 .../helix/healthcheck/HealthReportProvider.java |  39 --
 .../healthcheck/HealthStatsAggregationTask.java |  89 ----
 .../healthcheck/HealthStatsAggregator.java      | 141 ------
 .../ParticipantHealthReportCollector.java       |  32 --
 .../ParticipantHealthReportCollectorImpl.java   | 115 -----
 .../ParticipantHealthReportTask.java            |  71 ---
 .../PerformanceHealthReportProvider.java        | 138 -----
 .../java/org/apache/helix/healthcheck/Stat.java | 125 -----
 .../healthcheck/StatHealthReportProvider.java   | 159 ------
 .../healthcheck/WindowAggregationType.java      |  67 ---
 .../apache/helix/healthcheck/package-info.java  |  23 -
 .../helix/manager/zk/CallbackHandler.java       |  13 -
 .../manager/zk/ParticipantManagerHelper.java    |  11 -
 .../apache/helix/manager/zk/ZKHelixAdmin.java   | 141 ------
 .../apache/helix/manager/zk/ZKHelixManager.java |  46 +-
 .../java/org/apache/helix/model/HealthStat.java | 147 ------
 .../monitoring/mbeans/ClusterAlertItem.java     |  88 ----
 .../mbeans/ClusterAlertItemMBean.java           |  30 --
 .../mbeans/ClusterAlertMBeanCollection.java     | 275 ----------
 .../java/org/apache/helix/task/TaskDriver.java  |   2 +-
 .../org/apache/helix/tools/ClusterSetup.java    |  52 --
 .../java/org/apache/helix/util/HelixUtil.java   |  16 -
 .../src/test/java/org/apache/helix/Mocks.java   | 124 +----
 ...estParticipantHealthReportCollectorImpl.java |  78 ---
 .../java/org/apache/helix/TestPerfCounters.java |  69 ---
 .../TestPerformanceHealthReportProvider.java    | 160 ------
 .../org/apache/helix/alerts/TestAddAlerts.java  | 116 -----
 .../helix/alerts/TestAddPersistentStats.java    | 211 --------
 .../helix/alerts/TestAlertValidation.java       | 169 -------
 .../alerts/TestArrivingParticipantStats.java    | 498 -------------------
 .../helix/alerts/TestBaseStatsValidation.java   | 173 -------
 .../apache/helix/alerts/TestEvaluateAlerts.java | 393 ---------------
 .../org/apache/helix/alerts/TestOperators.java  | 329 ------------
 .../org/apache/helix/alerts/TestStatsMatch.java | 107 ----
 .../controller/stages/DummyClusterManager.java  |  15 -
 .../stages/TestParseInfoFromAlert.java          |  56 ---
 .../helix/healthcheck/TestAddDropAlert.java     | 171 -------
 .../healthcheck/TestAlertActionTriggering.java  | 226 ---------
 .../helix/healthcheck/TestAlertFireHistory.java | 426 ----------------
 .../helix/healthcheck/TestDummyAlerts.java      | 148 ------
 .../helix/healthcheck/TestExpandAlert.java      | 186 -------
 .../helix/healthcheck/TestSimpleAlert.java      | 200 --------
 .../healthcheck/TestSimpleWildcardAlert.java    | 246 ---------
 .../helix/healthcheck/TestStalenessAlert.java   | 180 -------
 .../helix/healthcheck/TestWildcardAlert.java    | 296 -----------
 .../helix/manager/zk/TestZkClusterManager.java  |   4 -
 .../MockEspressoHealthReportProvider.java       |  81 ---
 .../MockHealthReportParticipant.java            | 248 ---------
 .../TestClusterAlertItemMBeanCollection.java    | 293 -----------
 .../helix/participant/MockZKHelixManager.java   |  15 -
 89 files changed, 34 insertions(+), 10689 deletions(-)
----------------------------------------------------------------------