Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 141F210C47 for ; Fri, 9 Jan 2015 19:54:01 +0000 (UTC) Received: (qmail 61574 invoked by uid 500); 9 Jan 2015 19:54:02 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61539 invoked by uid 500); 9 Jan 2015 19:54:02 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 61526 invoked by uid 99); 9 Jan 2015 19:54:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2015 19:54:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 18229816E95; Fri, 9 Jan 2015 19:54:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Fri, 09 Jan 2015 19:54:02 -0000 Message-Id: In-Reply-To: <71946e47e6484e1ba6d18836d6a83d92@git.apache.org> References: <71946e47e6484e1ba6d18836d6a83d92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] accumulo git commit: ACCUMULO-3468 Increase zk timeout in MonitorUtil. ACCUMULO-3468 Increase zk timeout in MonitorUtil. Causes troubles in MonitorLoggingIT from being too low. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/02142ff4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/02142ff4 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/02142ff4 Branch: refs/heads/master Commit: 02142ff4154e81d9d0e355470a9e0780c7c3ada0 Parents: 64567e7 Author: Josh Elser Authored: Fri Jan 9 13:00:44 2015 -0500 Committer: Josh Elser Committed: Fri Jan 9 14:41:31 2015 -0500 ---------------------------------------------------------------------- core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/02142ff4/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java index 2726aeb..309f323 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java @@ -26,7 +26,7 @@ import org.apache.zookeeper.KeeperException; public class MonitorUtil { public static String getLocation(Instance instance) throws KeeperException, InterruptedException { - ZooReader zr = new ZooReader(instance.getZooKeepers(), 5000); + ZooReader zr = new ZooReader(instance.getZooKeepers(), 30000); byte[] loc = zr.getData(ZooUtil.getRoot(instance) + Constants.ZMONITOR_HTTP_ADDR, null); return loc == null ? null : new String(loc, UTF_8); }