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 7313C11EA0 for ; Tue, 16 Sep 2014 20:15:51 +0000 (UTC) Received: (qmail 78519 invoked by uid 500); 16 Sep 2014 20:15:51 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 78467 invoked by uid 500); 16 Sep 2014 20:15:51 -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 78453 invoked by uid 99); 16 Sep 2014 20:15:51 -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, 16 Sep 2014 20:15:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0F0EFA16DC7; Tue, 16 Sep 2014 20:15:51 +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, 16 Sep 2014 20:15:52 -0000 Message-Id: <280930bb39b547e19c12ae8a4ad0ee72@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] git commit: ACCUMULO-3130 Try to make the test end faster. ACCUMULO-3130 Try to make the test end faster. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2da2304a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2da2304a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2da2304a Branch: refs/heads/master Commit: 2da2304a684c067c4054b747958950e17893c057 Parents: 6e205e0 Author: Josh Elser Authored: Tue Sep 16 14:40:28 2014 -0400 Committer: Josh Elser Committed: Tue Sep 16 16:15:34 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/replication/MultiInstanceReplicationIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2da2304a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java index fcab23b..fb09706 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java @@ -253,6 +253,8 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { } catch (TimeoutException e) { future.cancel(true); Assert.fail("Drain did not finish within 60 seconds"); + } finally { + executor.shutdownNow(); } log.info("drain completed"); @@ -546,7 +548,7 @@ public class MultiInstanceReplicationIT extends ConfigurableMacIT { peerCfg.setNumTservers(1); peerCfg.setInstanceName("peer"); peerCfg.setProperty(Property.REPLICATION_NAME, "peer"); - + updatePeerConfigFromPrimary(getCluster().getConfig(), peerCfg); MiniAccumuloClusterImpl peer1Cluster = peerCfg.build();