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 88029200B62 for ; Fri, 12 Aug 2016 17:09:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 86B52160AB6; Fri, 12 Aug 2016 15:09:30 +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 CF8C5160AB0 for ; Fri, 12 Aug 2016 17:09:29 +0200 (CEST) Received: (qmail 80191 invoked by uid 500); 12 Aug 2016 15:09:29 -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 80170 invoked by uid 99); 12 Aug 2016 15:09:29 -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; Fri, 12 Aug 2016 15:09:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CAC4DE0A51; Fri, 12 Aug 2016 15:09:28 +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 Date: Fri, 12 Aug 2016 15:09:29 -0000 Message-Id: <4e22174414714829b3e5e99218b2884b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] ambari git commit: AMBARI-18012 : Metrics Sink unable to connect to zookeeper to locate collector host. (avijayan) archived-at: Fri, 12 Aug 2016 15:09:30 -0000 AMBARI-18012 : Metrics Sink unable to connect to zookeeper to locate collector host. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9696b62a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9696b62a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9696b62a Branch: refs/heads/trunk Commit: 9696b62afb98a7e94815e9aec26692d533cad12a Parents: 95754ab Author: Aravindan Vijayan Authored: Fri Aug 12 08:08:55 2016 -0700 Committer: Aravindan Vijayan Committed: Fri Aug 12 08:08:55 2016 -0700 ---------------------------------------------------------------------- .../availability/MetricCollectorHAHelper.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9696b62a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java index 7b13362..4d0ec14 100644 --- a/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java +++ b/ambari-metrics/ambari-metrics-common/src/main/java/org/apache/hadoop/metrics2/sink/timeline/availability/MetricCollectorHAHelper.java @@ -22,13 +22,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.curator.CuratorZookeeperClient; import org.apache.curator.RetryLoop; import org.apache.curator.RetryPolicy; -import org.apache.curator.retry.RetryOneTime; import org.apache.curator.retry.RetryUntilElapsed; import org.apache.zookeeper.ZooKeeper; -import java.net.HttpURLConnection; import java.util.Collection; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.concurrent.Callable; @@ -43,7 +42,7 @@ public class MetricCollectorHAHelper { private final int sleepMsBetweenRetries; private static final int CONNECTION_TIMEOUT = 2000; - private static final int SESSION_TIMEOUT = 5000; + private static final int SESSION_TIMEOUT = 10000; private static final String ZK_PATH = "/ambari-metrics-cluster/LIVEINSTANCES"; private static final String INSTANCE_NAME_DELIMITER = "_"; @@ -68,15 +67,15 @@ public class MetricCollectorHAHelper { final CuratorZookeeperClient client = new CuratorZookeeperClient(zookeeperQuorum, SESSION_TIMEOUT, CONNECTION_TIMEOUT, null, retryPolicy); - String liveInstances = null; + List liveInstances = null; try { - liveInstances = RetryLoop.callWithRetry(client, new Callable() { + client.start(); + liveInstances = RetryLoop.callWithRetry(client, new Callable>() { @Override - public String call() throws Exception { + public List call() throws Exception { ZooKeeper zookeeper = client.getZooKeeper(); - byte[] data = zookeeper.getData(ZK_PATH, null, null); - return data != null ? new String(data) : null; + return zookeeper.getChildren(ZK_PATH, false); } }); } catch (Exception e) { @@ -86,7 +85,7 @@ public class MetricCollectorHAHelper { // [ambari-sid-3.c.pramod-thangali.internal_12001] if (liveInstances != null && !liveInstances.isEmpty()) { - for (String instanceStr : liveInstances.split(",")) { + for (String instanceStr : liveInstances) { collectors.add(instanceStr.substring(0, instanceStr.indexOf(INSTANCE_NAME_DELIMITER))); } }