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 1B7F4200BD5 for ; Thu, 8 Dec 2016 21:58:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1A15D160B1F; Thu, 8 Dec 2016 20:58:20 +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 64C74160B0A for ; Thu, 8 Dec 2016 21:58:19 +0100 (CET) Received: (qmail 30217 invoked by uid 500); 8 Dec 2016 20:58:18 -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 30208 invoked by uid 99); 8 Dec 2016 20:58:18 -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, 08 Dec 2016 20:58:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6D36DE108E; Thu, 8 Dec 2016 20:58:18 +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: <703c7f42c9e145fd924f4925ad83cc9f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-19134 : Storm start is failing due to ClassNotFoundException org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsReporter. (avijayan) Date: Thu, 8 Dec 2016 20:58:18 +0000 (UTC) archived-at: Thu, 08 Dec 2016 20:58:20 -0000 Repository: ambari Updated Branches: refs/heads/trunk a27c0dd34 -> b2a8edf8e AMBARI-19134 : Storm start is failing due to ClassNotFoundException org.apache.hadoop.metrics2.sink.storm.StormTimelineMetricsReporter. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2a8edf8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2a8edf8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2a8edf8 Branch: refs/heads/trunk Commit: b2a8edf8edf77ae49d4b922590f6d4dcdedc5e4d Parents: a27c0dd Author: Aravindan Vijayan Authored: Thu Dec 8 12:58:07 2016 -0800 Committer: Aravindan Vijayan Committed: Thu Dec 8 12:58:07 2016 -0800 ---------------------------------------------------------------------- .../metrics2/sink/timeline/AbstractTimelineMetricsSink.java | 5 +++++ .../sink/timeline/cache/HandleConnectExceptionTest.java | 4 ++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b2a8edf8/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java index f92f968..9bc3be5 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/AbstractTimelineMetricsSink.java @@ -222,6 +222,11 @@ public abstract class AbstractTimelineMetricsSink { collectorHost = findPreferredCollectHost(); } + if (collectorHost == null) { + LOG.warn("No live collector to send metrics to. Metrics to be sent will be discarded."); + return false; + } + String connectUrl = getCollectorUri(collectorHost); String jsonData = null; LOG.debug("EmitMetrics connectUrl = " + connectUrl); http://git-wip-us.apache.org/repos/asf/ambari/blob/b2a8edf8/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java index 36ec074..32fe32e 100644 --- a/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java +++ b/ambari-metrics/ambari-metrics-common/src/test/java/org/apache/hadoop/metrics2/sink/timeline/cache/HandleConnectExceptionTest.java @@ -130,6 +130,10 @@ public class HandleConnectExceptionTest { return super.emitMetrics(metrics); } + @Override + protected synchronized String findPreferredCollectHost() { + return "localhost"; + } } }