LogFeeder AMS client changes for HA(avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2a859ff7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2a859ff7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2a859ff7 Branch: refs/heads/branch-2.5 Commit: 2a859ff73c358e194a2c2865a980eaa2c41e6b6d Parents: b33c4fc Author: Aravindan Vijayan <[email protected]> Authored: Tue Nov 15 11:02:03 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Nov 15 11:06:41 2016 -0800 ---------------------------------------------------------------------- .../logfeeder/metrics/LogFeederAMSClient.java | 29 +++++++++++++++++++- .../logfeeder/metrics/MetricsManager.java | 14 ++-------- 2 files changed, 30 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2a859ff7/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java index 0766514..6fcfd64 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java @@ -25,6 +25,8 @@ import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.log4j.Logger; +import java.util.Collection; + public class LogFeederAMSClient extends AbstractTimelineMetricsSink { private static final Logger LOG = Logger.getLogger(LogFeederAMSClient.class); @@ -42,7 +44,7 @@ public class LogFeederAMSClient extends AbstractTimelineMetricsSink { } @Override - public String getCollectorUri() { + public String getCollectorUri(String host) { return collectorHosts; } @@ -53,8 +55,33 @@ public class LogFeederAMSClient extends AbstractTimelineMetricsSink { } @Override + protected String getZookeeperQuorum() { + return null; + } + + @Override + protected Collection<String> getConfiguredCollectorHosts() { + return null; + } + + @Override + protected String getHostname() { + return null; + } + + @Override protected boolean emitMetrics(TimelineMetrics metrics) { return super.emitMetrics(metrics); } + @Override + protected String getCollectorProtocol() { + return null; + } + + @Override + protected String getCollectorPort() { + return null; + } + } http://git-wip-us.apache.org/repos/asf/ambari/blob/2a859ff7/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java index fca2b20..1a33847 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java @@ -49,14 +49,14 @@ public class MetricsManager { LOG.info("Initializing MetricsManager()"); amsClient = new LogFeederAMSClient(); - if (amsClient.getCollectorUri() != null) { + if (amsClient.getCollectorUri(null) != null) { findNodeHostName(); if (nodeHostName == null) { isMetricsEnabled = false; LOG.error("Failed getting hostname for node. Disabling publishing LogFeeder metrics"); } else { isMetricsEnabled = true; - LOG.info("LogFeeder Metrics is enabled. Metrics host=" + amsClient.getCollectorUri()); + LOG.info("LogFeeder Metrics is enabled. Metrics host=" + amsClient.getCollectorUri(null)); } } else { LOG.info("LogFeeder Metrics publish is disabled"); @@ -78,16 +78,6 @@ public class MetricsManager { } catch (Throwable e) { LOG.warn("Error getting hostname using InetAddress.getLocalHost().getCanonicalHostName()", e); } - if (nodeHostName == null) { - isMetricsEnabled = false; - LOG.error("Failed getting hostname for node. Disabling publishing LogFeeder metrics"); - } else { - isMetricsEnabled = true; - LOG.info("LogFeeder Metrics is enabled. Metrics host=" - + amsClient.getCollectorUri()); - } - } else { - LOG.info("LogFeeder Metrics publish is disabled"); } }
