Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6BFD0200BB6 for ; Fri, 21 Oct 2016 01:29:52 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6A8F6160AF2; Thu, 20 Oct 2016 23:29:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B2F31160AE0 for ; Fri, 21 Oct 2016 01:29:51 +0200 (CEST) Received: (qmail 43232 invoked by uid 500); 20 Oct 2016 23:29:50 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 43223 invoked by uid 99); 20 Oct 2016 23:29:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Oct 2016 23:29:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C60A7E08DF; Thu, 20 Oct 2016 23:29:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: avijayan@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18655 : Metric level hadoop metrics2 filter is incompatible with AMS HadoopTimelineMetricsSink. (avijayan) Date: Thu, 20 Oct 2016 23:29:50 +0000 (UTC) archived-at: Thu, 20 Oct 2016 23:29:52 -0000 Repository: ambari Updated Branches: refs/heads/trunk 5256a7890 -> dd0cc32b7 AMBARI-18655 : Metric level hadoop metrics2 filter is incompatible with AMS HadoopTimelineMetricsSink. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd0cc32b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd0cc32b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd0cc32b Branch: refs/heads/trunk Commit: dd0cc32b71988add58d6e796dc77722a937c28b1 Parents: 5256a78 Author: Aravindan Vijayan Authored: Thu Oct 20 16:29:35 2016 -0700 Committer: Aravindan Vijayan Committed: Thu Oct 20 16:29:35 2016 -0700 ---------------------------------------------------------------------- .../metrics2/sink/timeline/HadoopTimelineMetricsSink.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dd0cc32b/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 d81187e..2bfc6db 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 @@ -298,19 +298,14 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple } int sbBaseLen = sb.length(); - - Collection metrics = (Collection) record.metrics(); - List metricList = new ArrayList(); Map metadata = null; if (skipAggregation) { metadata = Collections.singletonMap("skipAggregation", "true"); } - - long startTime = record.timestamp(); - for (AbstractMetric metric : metrics) { + for (AbstractMetric metric : record.metrics()) { sb.append(metric.name()); String name = sb.toString(); Number value = metric.value();