You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/12/04 20:03:24 UTC

git commit: ACCUMULO-1953: fix intermittent failure due to race in MultiTableBatchWriterTest.testOfflineTable

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 <el...@apache.org>


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 <mb...@sqrrl.com>
Authored: Wed Dec 4 13:50:19 2013 -0500
Committer: Josh Elser <el...@apache.org>
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