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 D36321046A for ; Thu, 27 Mar 2014 20:27:49 +0000 (UTC) Received: (qmail 6973 invoked by uid 500); 27 Mar 2014 20:27:42 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 6911 invoked by uid 500); 27 Mar 2014 20:27:39 -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 4144 invoked by uid 99); 27 Mar 2014 20:27:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 20:27:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47CCF8AB0E5; Thu, 27 Mar 2014 20:27:18 +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: Thu, 27 Mar 2014 20:27:20 -0000 Message-Id: <4bfba4a8b2084afbbddec114b1191e80@git.apache.org> In-Reply-To: <6d6236490dc048cf9b4c49f09acd12ec@git.apache.org> References: <6d6236490dc048cf9b4c49f09acd12ec@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] git commit: ACCUMULO-2433 Try to stabilize listscans on ShellServerTest ACCUMULO-2433 Try to stabilize listscans on ShellServerTest Remove the ZKI and Connector timing from the 5s that we used to look for the slow scan that was running. Increase the amount of time inbetween calls to listscans. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1964b27 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1964b27 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1964b27 Branch: refs/heads/master Commit: c1964b27fb7d9fed9b5f68f66ca7532f7964cdd6 Parents: 7ec60f1 Author: Josh Elser Authored: Thu Mar 27 12:41:34 2014 -0700 Committer: Josh Elser Committed: Thu Mar 27 12:41:34 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/ShellServerTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1964b27/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java index 9b2ab33..7bda585 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java @@ -818,12 +818,15 @@ public class ShellServerTest { } exec("config -t " + table + " -s table.iterator.scan.slow=30,org.apache.accumulo.test.functional.SlowIterator", true); exec("config -t " + table + " -s table.iterator.scan.slow.opt.sleepTime=500", true); + + + ZooKeeperInstance instance = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers()); + Connector connector = instance.getConnector("root", new PasswordToken(secret)); + final Scanner s = connector.createScanner(table, Constants.NO_AUTHS); + Thread thread = new Thread() { public void run() { try { - ZooKeeperInstance instance = new ZooKeeperInstance(cluster.getInstanceName(), cluster.getZooKeepers()); - Connector connector = instance.getConnector("root", new PasswordToken(secret)); - Scanner s = connector.createScanner(table, Constants.NO_AUTHS); for (@SuppressWarnings("unused") Entry kv : s) ; @@ -835,7 +838,7 @@ public class ShellServerTest { thread.start(); List scans = new ArrayList(); - // Try to find the active scan for about 5seconds + // Try to find the active scan for about 15seconds for (int i = 0; i < 50 && scans.isEmpty(); i++) { String currentScans = exec("listscans", true); String[] lines = currentScans.split("\n"); @@ -845,7 +848,7 @@ public class ShellServerTest { scans.add(currentScan); } } - UtilWaitThread.sleep(100); + UtilWaitThread.sleep(300); } thread.join();