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 A510F18C13 for ; Wed, 10 Feb 2016 18:05:58 +0000 (UTC) Received: (qmail 54687 invoked by uid 500); 10 Feb 2016 18:05:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 54549 invoked by uid 500); 10 Feb 2016 18:05:58 -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 54499 invoked by uid 99); 10 Feb 2016 18:05:58 -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; Wed, 10 Feb 2016 18:05:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 39936E051D; Wed, 10 Feb 2016 18:05:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 10 Feb 2016 18:06:00 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] accumulo git commit: ACCUMULO-4139 Fix ExistingMacIT test bug ACCUMULO-4139 Fix ExistingMacIT test bug Make ExistingMacIT wait the full ZK timeout (plus half a second) based on mini's configured ZK timeout value. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d36e317a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d36e317a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d36e317a Branch: refs/heads/master Commit: d36e317a83765984cb83aee27b7616bb2aee226d Parents: 95f5aff Author: Christopher Tubbs Authored: Wed Feb 10 12:58:07 2016 -0500 Committer: Christopher Tubbs Committed: Wed Feb 10 12:58:07 2016 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d36e317a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java index 323888a..bef2486 100644 --- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java @@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -100,7 +101,8 @@ public class ExistingMacIT extends ConfigurableMacIT { } // TODO clean out zookeeper? following sleep waits for ephemeral nodes to go away - UtilWaitThread.sleep(10000); + long zkTimeout = AccumuloConfiguration.getTimeInMillis(getCluster().getConfig().getSiteConfig().get(Property.INSTANCE_ZK_TIMEOUT.getKey())); + UtilWaitThread.sleep(zkTimeout + 500); File hadoopConfDir = createTestDir(ExistingMacIT.class.getSimpleName() + "_hadoop_conf"); FileUtils.deleteQuietly(hadoopConfDir);