You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/01/27 18:17:59 UTC
[48/49] ambari git commit: AMBARI-19732. Allow all sinks a config
override to point to a different ZK quorum. Compilation failure. (swagle)
AMBARI-19732. Allow all sinks a config override to point to a different ZK quorum. Compilation failure. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9963ac81
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9963ac81
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9963ac81
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9963ac81963e01eec66467f0536b4ebdf058aa6e
Parents: 7c7769b
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Jan 27 10:11:49 2017 -0800
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Jan 27 10:11:49 2017 -0800
----------------------------------------------------------------------
.../hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9963ac81/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
----------------------------------------------------------------------
diff --git a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index e72d01f..923de0f 100644
--- a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -108,8 +108,8 @@ public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink
protocol = configuration.getProperty(COLLECTOR_PROTOCOL, "http");
port = configuration.getProperty(COLLECTOR_PORT, "6188");
- zkQuorum = StringUtils.isEmpty(conf.getProperty(COLLECTOR_ZOOKEEPER_QUORUM)) ?
- conf.getProperty(ZOOKEEPER_QUORUM) : conf.getProperty(COLLECTOR_ZOOKEEPER_QUORUM);
+ zkQuorum = StringUtils.isEmpty(configuration.getProperty(COLLECTOR_ZOOKEEPER_QUORUM)) ?
+ configuration.getProperty(ZOOKEEPER_QUORUM) : configuration.getProperty(COLLECTOR_ZOOKEEPER_QUORUM);
timeoutSeconds = configuration.getProperty(METRICS_POST_TIMEOUT_SECONDS) != null ?
Integer.parseInt(configuration.getProperty(METRICS_POST_TIMEOUT_SECONDS)) :