address review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a9647d8b Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a9647d8b Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a9647d8b Branch: refs/heads/1.x-branch Commit: a9647d8bffd2df8c7e3dcc31d8ce720babf4d0f8 Parents: 85dbacd Author: P. Taylor Goetz <[email protected]> Authored: Fri Dec 8 15:14:53 2017 -0500 Committer: P. Taylor Goetz <[email protected]> Committed: Fri Dec 8 15:14:53 2017 -0500 ---------------------------------------------------------------------- conf/defaults.yaml | 1 - .../org/apache/storm/metrics2/DisruptorMetrics.java | 16 ++++++++-------- .../apache/storm/metrics2/StormMetricRegistry.java | 2 +- .../storm/metrics2/filters/StormMetricsFilter.java | 2 +- .../metrics2/reporters/GangliaStormReporter.java | 3 --- .../apache/storm/validation/ConfigValidation.java | 7 ++++--- 6 files changed, 14 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/conf/defaults.yaml ---------------------------------------------------------------------- diff --git a/conf/defaults.yaml b/conf/defaults.yaml index e51b50c..435a7e8 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -314,7 +314,6 @@ storm.cluster.metrics.consumer.publish.interval.secs: 60 # - "worker" # report.period: 10 # report.period.units: "SECONDS" -# # filter: # class: "org.apache.storm.metrics2.filters.RegexFilter" # expression: ".*my_component.*emitted.*" http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/storm-core/src/jvm/org/apache/storm/metrics2/DisruptorMetrics.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/DisruptorMetrics.java b/storm-core/src/jvm/org/apache/storm/metrics2/DisruptorMetrics.java index 22eb6c5..42f698c 100644 --- a/storm-core/src/jvm/org/apache/storm/metrics2/DisruptorMetrics.java +++ b/storm-core/src/jvm/org/apache/storm/metrics2/DisruptorMetrics.java @@ -20,14 +20,14 @@ package org.apache.storm.metrics2; import org.apache.storm.utils.DisruptorQueue; public class DisruptorMetrics { - private SimpleGauge<Long> capacity; - private SimpleGauge<Long> population; - private SimpleGauge<Long> writePosition; - private SimpleGauge<Long> readPosition; - private SimpleGauge<Double> arrivalRate; - private SimpleGauge<Double> sojournTime; - private SimpleGauge<Long> overflow; - private SimpleGauge<Float> pctFull; + private final SimpleGauge<Long> capacity; + private final SimpleGauge<Long> population; + private final SimpleGauge<Long> writePosition; + private final SimpleGauge<Long> readPosition; + private final SimpleGauge<Double> arrivalRate; + private final SimpleGauge<Double> sojournTime; + private final SimpleGauge<Long> overflow; + private final SimpleGauge<Float> pctFull; DisruptorMetrics(SimpleGauge<Long> capacity, http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/storm-core/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java b/storm-core/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java index 912d888..200ddcf 100644 --- a/storm-core/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java +++ b/storm-core/src/jvm/org/apache/storm/metrics2/StormMetricRegistry.java @@ -83,7 +83,7 @@ public class StormMetricRegistry { try { hostName = Utils.localHostname(); } catch (UnknownHostException e) { - LOG.warn("Unable to determine hostname while starting the metrics system. Hostname ill be reported" + + LOG.warn("Unable to determine hostname while starting the metrics system. Hostname will be reported" + " as 'localhost'."); } http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/storm-core/src/jvm/org/apache/storm/metrics2/filters/StormMetricsFilter.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/filters/StormMetricsFilter.java b/storm-core/src/jvm/org/apache/storm/metrics2/filters/StormMetricsFilter.java index 57f7255..8e6b95f 100644 --- a/storm-core/src/jvm/org/apache/storm/metrics2/filters/StormMetricsFilter.java +++ b/storm-core/src/jvm/org/apache/storm/metrics2/filters/StormMetricsFilter.java @@ -25,7 +25,7 @@ public interface StormMetricsFilter extends MetricFilter { /** * Called after the filter is instantiated. - * @param config an arbitrary configuration map pulled from the yaml configuration. + * @param config A map of the properties from the 'filter' section of the reporter configuration. */ void prepare(Map<String, Object> config); http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java index 09af2e1..497cb04 100644 --- a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java +++ b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java @@ -84,9 +84,6 @@ public class GangliaStormReporter extends ScheduledStormReporter { //defaults to seconds reportingPeriodUnit = getReportPeriodUnit(reporterConf); - // Not exposed: - // * withClock(Clock) - String group = getMetricsTargetUDPGroup(reporterConf); Integer port = getMetricsTargetPort(reporterConf); String udpAddressingMode = getMetricsTargetUDPAddressingMode(reporterConf); http://git-wip-us.apache.org/repos/asf/storm/blob/a9647d8b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java index 8bcea84..89aecee 100644 --- a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java +++ b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java @@ -518,15 +518,16 @@ public class ConfigValidation { (((String) string).equals("nimbus") || ((String) string).equals("supervisor") || ((String) string).equals("worker"))) { - return; + continue; } - throw new IllegalArgumentException("Field daemons must contain at least one of \"nimbus\", \"supervisor\", or \"worker\""); + throw new IllegalArgumentException("Field 'daemons' must contain at least one of the following:" + + " \"nimbus\", \"supervisor\", or \"worker\""); } } if(((Map)o).containsKey("filter")){ Map filterMap = (Map)((Map)o).get("filter"); - SimpleTypeValidator.validateField("filter", String.class, filterMap.get("class")); + SimpleTypeValidator.validateField("class", String.class, filterMap.get("class")); } SimpleTypeValidator.validateField(name, String.class, ((Map) o).get("class"));
