Repository: ambari Updated Branches: refs/heads/branch-2.0.0 86f309f4b -> a842630e4
AMBARI-10019. Metrics are absent on slider View page. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a842630e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a842630e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a842630e Branch: refs/heads/branch-2.0.0 Commit: a842630e4decb38c2e763f947bc8bd13d6fd5be3 Parents: 86f309f Author: Siddharth Wagle <[email protected]> Authored: Tue Mar 10 16:41:13 2015 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Tue Mar 10 16:41:13 2015 -0700 ---------------------------------------------------------------------- .../sink/timeline/HadoopTimelineMetricsSink.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a842630e/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java index 9ecb0ed..12230f5 100644 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java @@ -31,6 +31,7 @@ import java.util.Set; import org.apache.commons.configuration.SubsetConfiguration; import org.apache.commons.lang.ClassUtils; +import org.apache.commons.lang.StringUtils; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.metrics2.AbstractMetric; @@ -54,6 +55,7 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple private List<? extends SocketAddress> metricsServers; private String collectorUri; private static final String SERVICE_NAME_PREFIX = "serviceName-prefix"; + private static final String SERVICE_NAME = "serviceName"; @Override public void init(SubsetConfiguration conf) { @@ -75,6 +77,8 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple serviceName = getServiceName(conf); + LOG.info("Identified hostname = " + hostName + ", serviceName = " + serviceName); + // Load collector configs metricsServers = Servers.parse(conf.getString(COLLECTOR_HOST_PROPERTY), 6188); @@ -85,6 +89,8 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple + "/ws/v1/timeline/metrics"; } + LOG.info("Collector Uri: " + collectorUri); + int maxRowCacheSize = conf.getInt(MAX_METRIC_ROW_CACHE_SIZE, TimelineMetricsCache.MAX_RECS_PER_NAME_DEFAULT); int metricsSendInterval = conf.getInt(METRICS_SEND_INTERVAL, @@ -118,10 +124,18 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple } } + /** + * Return configured serviceName with or without prefix. + * Default without serviceName or configured prefix : first config prefix + * With prefix : configured prefix + first config prefix + * Configured serviceName : Return serviceName as is. + */ private String getServiceName(SubsetConfiguration conf) { String serviceNamePrefix = conf.getString(SERVICE_NAME_PREFIX, ""); - return serviceNamePrefix.isEmpty() ? getFirstConfigPrefix(conf) : - serviceNamePrefix + "-" + getFirstConfigPrefix(conf); + String serviceName = conf.getString(SERVICE_NAME, ""); + return StringUtils.isEmpty(serviceName) ? + StringUtils.isEmpty(serviceNamePrefix) ? getFirstConfigPrefix(conf) + : serviceNamePrefix + "-" + getFirstConfigPrefix(conf) : serviceName; } private String getFirstConfigPrefix(SubsetConfiguration conf) {
