Addressing Code review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9368619f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9368619f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9368619f Branch: refs/heads/1.x-branch Commit: 9368619fb745da2e370881264f4c8278cb3b5bbf Parents: e84528b Author: Kishor Patil <[email protected]> Authored: Wed Feb 3 16:35:36 2016 -0600 Committer: Kishor Patil <[email protected]> Committed: Fri Feb 5 19:28:32 2016 +0000 ---------------------------------------------------------------------- conf/defaults.yaml | 2 +- storm-core/src/jvm/org/apache/storm/Config.java | 5 ++--- .../src/jvm/org/apache/storm/statistics/StatisticsUtils.java | 2 +- .../apache/storm/statistics/reporters/PreparableReporter.java | 6 +++--- 4 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/9368619f/conf/defaults.yaml ---------------------------------------------------------------------- diff --git a/conf/defaults.yaml b/conf/defaults.yaml index b468290..5df4a63 100644 --- a/conf/defaults.yaml +++ b/conf/defaults.yaml @@ -283,5 +283,5 @@ pacemaker.auth.method: "NONE" pacemaker.kerberos.users: [] #default plugin for daemon statistics reporter -storm.statistics.preparable.reporter.plugin: +storm.statistics.preparable.reporter.plugins: - "org.apache.storm.statistics.reporters.JmxPreparableReporter" http://git-wip-us.apache.org/repos/asf/storm/blob/9368619f/storm-core/src/jvm/org/apache/storm/Config.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/Config.java b/storm-core/src/jvm/org/apache/storm/Config.java index 9d18667..adeb4d6 100644 --- a/storm-core/src/jvm/org/apache/storm/Config.java +++ b/storm-core/src/jvm/org/apache/storm/Config.java @@ -140,11 +140,10 @@ public class Config extends HashMap<String, Object> { public static final String STORM_META_SERIALIZATION_DELEGATE = "storm.meta.serialization.delegate"; /** - * A list of statistics preparable reporter class names. + * A list of daemon statistics reporter plugin class names. */ - @NotNull @isStringList - public static final String STORM_STATISTICS_PREPARABLE_REPORTER_PLUGIN = "storm.statistics.preparable.reporter.plugin"; + public static final String STORM_STATISTICS_PREPARABLE_REPORTER_PLUGINS = "storm.statistics.preparable.reporter.plugins"; /** * A list of hosts of ZooKeeper servers used to manage the cluster. http://git-wip-us.apache.org/repos/asf/storm/blob/9368619f/storm-core/src/jvm/org/apache/storm/statistics/StatisticsUtils.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/statistics/StatisticsUtils.java b/storm-core/src/jvm/org/apache/storm/statistics/StatisticsUtils.java index ba7edc4..12d33c4 100644 --- a/storm-core/src/jvm/org/apache/storm/statistics/StatisticsUtils.java +++ b/storm-core/src/jvm/org/apache/storm/statistics/StatisticsUtils.java @@ -33,7 +33,7 @@ public class StatisticsUtils { public static List<PreparableReporter> getPreparableReporters(Map stormConf) { PreparableReporter reporter = new JmxPreparableReporter(); - List<String> clazzes = (List<String>) stormConf.get(Config.STORM_STATISTICS_PREPARABLE_REPORTER_PLUGIN); + List<String> clazzes = (List<String>) stormConf.get(Config.STORM_STATISTICS_PREPARABLE_REPORTER_PLUGINS); List<PreparableReporter> reporterList = new ArrayList<>(); if (clazzes != null) { http://git-wip-us.apache.org/repos/asf/storm/blob/9368619f/storm-core/src/jvm/org/apache/storm/statistics/reporters/PreparableReporter.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/statistics/reporters/PreparableReporter.java b/storm-core/src/jvm/org/apache/storm/statistics/reporters/PreparableReporter.java index ce3e8fe..dc29a4a 100644 --- a/storm-core/src/jvm/org/apache/storm/statistics/reporters/PreparableReporter.java +++ b/storm-core/src/jvm/org/apache/storm/statistics/reporters/PreparableReporter.java @@ -25,8 +25,8 @@ import java.util.Map; public interface PreparableReporter<T extends Reporter & Closeable> { - public abstract void prepare(MetricRegistry metricsRegistry, Map stormConf); - public abstract void start(); - public abstract void stop(); + public void prepare(MetricRegistry metricsRegistry, Map stormConf); + public void start(); + public void stop(); }
