Merge branch 'agresch_newmetrics_port' of https://github.com/agresch/storm into STORM-2909-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/26818f2b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/26818f2b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/26818f2b Branch: refs/heads/master Commit: 26818f2b45e8e83760380f1f4bb32907a10e594c Parents: b4e610c 21da5df Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Apr 10 18:10:59 2018 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Apr 10 18:10:59 2018 +0900 ---------------------------------------------------------------------- conf/defaults.yaml | 23 +++ .../org/apache/storm/perf/JCQueuePerfTest.java | 18 +- .../apache/storm/starter/AnchoredWordCount.java | 139 ++++++++++++++ pom.xml | 10 ++ storm-client/pom.xml | 13 ++ .../src/jvm/org/apache/storm/Config.java | 102 +++++++---- .../src/jvm/org/apache/storm/daemon/Task.java | 20 ++- .../daemon/metrics/ClientMetricsUtils.java | 52 ++++++ .../daemon/worker/BackPressureTracker.java | 12 +- .../org/apache/storm/daemon/worker/Worker.java | 18 +- .../apache/storm/daemon/worker/WorkerState.java | 29 +-- .../storm/daemon/worker/WorkerTransfer.java | 15 +- .../jvm/org/apache/storm/executor/Executor.java | 19 +- .../executor/bolt/BoltOutputCollectorImpl.java | 7 +- .../storm/executor/spout/SpoutExecutor.java | 43 +++-- .../org/apache/storm/metrics2/JcMetrics.java | 45 +++++ .../org/apache/storm/metrics2/SimpleGauge.java | 38 ++++ .../storm/metrics2/StormMetricRegistry.java | 180 +++++++++++++++++++ .../org/apache/storm/metrics2/TaskMetrics.java | 85 +++++++++ .../storm/metrics2/filters/RegexFilter.java | 48 +++++ .../metrics2/filters/StormMetricsFilter.java | 33 ++++ .../reporters/ConsoleStormReporter.java | 69 +++++++ .../metrics2/reporters/CsvStormReporter.java | 97 ++++++++++ .../reporters/GangliaStormReporter.java | 132 ++++++++++++++ .../reporters/GraphiteStormReporter.java | 102 +++++++++++ .../metrics2/reporters/JmxStormReporter.java | 92 ++++++++++ .../reporters/ScheduledStormReporter.java | 86 +++++++++ .../storm/metrics2/reporters/StormReporter.java | 35 ++++ .../apache/storm/stats/BoltExecutorStats.java | 32 +--- .../jvm/org/apache/storm/stats/CommonStats.java | 23 ++- .../apache/storm/stats/SpoutExecutorStats.java | 26 +-- .../org/apache/storm/task/TopologyContext.java | 74 +++++--- .../src/jvm/org/apache/storm/utils/JCQueue.java | 58 ++++-- .../storm/validation/ConfigValidation.java | 167 +++++++++++------ .../storm/utils/JCQueueBackpressureTest.java | 2 +- .../jvm/org/apache/storm/utils/JCQueueTest.java | 4 +- .../java/org/apache/storm/DaemonConfig.java | 41 ++--- .../storm/daemon/metrics/MetricsUtils.java | 39 +--- .../reporters/ConsolePreparableReporter.java | 16 +- .../reporters/CsvPreparableReporter.java | 17 +- .../reporters/JmxPreparableReporter.java | 12 +- .../storm/nimbus/DefaultTopologyValidator.java | 38 +++- .../storm/nimbus/StrictTopologyValidator.java | 67 +++++++ 43 files changed, 1830 insertions(+), 348 deletions(-) ----------------------------------------------------------------------
