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 D860510CEC for ; Wed, 4 Dec 2013 19:03:25 +0000 (UTC) Received: (qmail 2768 invoked by uid 500); 4 Dec 2013 19:03:25 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2701 invoked by uid 500); 4 Dec 2013 19:03:25 -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 2691 invoked by uid 99); 4 Dec 2013 19:03:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Dec 2013 19:03:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DBDB3B997; Wed, 4 Dec 2013 19:03:24 +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 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-1953: fix intermittent failure due to race in MultiTableBatchWriterTest.testOfflineTable Date: Wed, 4 Dec 2013 19:03:24 +0000 (UTC) Updated Branches: refs/heads/1.6.0-SNAPSHOT 5312aea50 -> b07d12976 ACCUMULO-1953: fix intermittent failure due to race in MultiTableBatchWriterTest.testOfflineTable Signed-off-by: Josh Elser Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b07d1297 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b07d1297 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b07d1297 Branch: refs/heads/1.6.0-SNAPSHOT Commit: b07d12976274876dfeb250ad0c2fe1e5a98e74cd Parents: 5312aea Author: Michael Berman Authored: Wed Dec 4 13:50:19 2013 -0500 Committer: Josh Elser Committed: Wed Dec 4 13:56:08 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/test/MultiTableBatchWriterTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b07d1297/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java index 5c2698e..b92eede 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java @@ -415,8 +415,8 @@ public class MultiTableBatchWriterTest { bw1.addMutation(m1); bw2.addMutation(m1); - tops.offline(table1); - tops.offline(table2); + tops.offline(table1, true); + tops.offline(table2, true); Mutation m2 = new Mutation("bar"); m2.put("col1", "", "val1"); @@ -432,7 +432,6 @@ public class MultiTableBatchWriterTest { } finally { if (null != mtbw) { try { - // Mutations might have flushed before the table offline occurred mtbw.close(); } catch (MutationsRejectedException e) { // Pass