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 CEB1510131 for ; Tue, 2 Dec 2014 20:36:50 +0000 (UTC) Received: (qmail 94782 invoked by uid 500); 2 Dec 2014 20:36:50 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 94675 invoked by uid 500); 2 Dec 2014 20:36:50 -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 94192 invoked by uid 99); 2 Dec 2014 20:36:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2014 20:36:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DA1A69BBF8E; Tue, 2 Dec 2014 20:36:49 +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: Tue, 02 Dec 2014 20:36:56 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] accumulo git commit: ACCUMULO-3167 Don't sleep "forever". Will block table deletion (albeit unwantedly) ACCUMULO-3167 Don't sleep "forever". Will block table deletion (albeit unwantedly) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c5b2f49 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c5b2f49 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c5b2f49 Branch: refs/heads/metrics2 Commit: 3c5b2f49d5697a7b9d48a6d011ebef6477c4a9d8 Parents: b430f89 Author: Josh Elser Authored: Wed Nov 19 17:29:36 2014 -0500 Committer: Josh Elser Committed: Mon Nov 24 18:08:17 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/InterruptibleScannersIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c5b2f49/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java b/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java index a1409e8..4c8bcba 100644 --- a/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java @@ -56,7 +56,8 @@ public class InterruptibleScannersIT extends AccumuloClusterIT { // make the world's slowest scanner final Scanner scanner = conn.createScanner(tableName, Authorizations.EMPTY); final IteratorSetting cfg = new IteratorSetting(100, SlowIterator.class); - SlowIterator.setSeekSleepTime(cfg, 99999*1000); + // Wait long enough to be sure we can catch it, but not indefinitely. + SlowIterator.setSeekSleepTime(cfg, 60 * 1000); scanner.addScanIterator(cfg); // create a thread to interrupt the slow scan final Thread scanThread = Thread.currentThread();