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/11/08 04:23:21 UTC
[3/3] git commit: ACCUMULO-1833 Ensure that we close the MTBW at the
end of the test to avoid it getting GC'ed later and trying to flush when ZK
and the instance is already gone.
ACCUMULO-1833 Ensure that we close the MTBW at the end of the test to
avoid it getting GC'ed later and trying to flush when ZK and the
instance is already gone.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0be6f0a7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0be6f0a7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0be6f0a7
Branch: refs/heads/ACCUMULO-1833-caching
Commit: 0be6f0a79ef404839ab64d60f16991c6031a93a3
Parents: fe8a33e
Author: Josh Elser <jo...@gmail.com>
Authored: Thu Nov 7 22:22:19 2013 -0500
Committer: Josh Elser <jo...@gmail.com>
Committed: Thu Nov 7 22:22:19 2013 -0500
----------------------------------------------------------------------
.../test/MultiTableBatchWriterTest.java | 415 +++++++++++--------
1 file changed, 231 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0be6f0a7/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 836faa4..2cb78ed 100644
--- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java
@@ -77,49 +77,55 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 60, TimeUnit.SECONDS);
- final String table1 = "testTableRenameSameWriters_table1", table2 = "testTableRenameSameWriters_table2";
- final String newTable1 = "testTableRenameSameWriters_newTable1", newTable2 = "testTableRenameSameWriters_newTable2";
-
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ try {
+ final String table1 = "testTableRenameSameWriters_table1", table2 = "testTableRenameSameWriters_table2";
+ final String newTable1 = "testTableRenameSameWriters_newTable1", newTable2 = "testTableRenameSameWriters_newTable2";
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- tops.rename(table1, newTable1);
- tops.rename(table2, newTable2);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- Mutation m2 = new Mutation("bar");
- m2.put("col1", "", "val1");
- m2.put("col2", "", "val2");
+ tops.rename(table1, newTable1);
+ tops.rename(table2, newTable2);
- bw1.addMutation(m2);
- bw2.addMutation(m2);
+ Mutation m2 = new Mutation("bar");
+ m2.put("col1", "", "val1");
+ m2.put("col2", "", "val2");
- mtbw.close();
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
- Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
- expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
- expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
- expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
- expectations.put(Maps.immutableEntry("bar", "col2"), "val2");
+ mtbw.close();
- for (String table : Arrays.asList(newTable1, newTable2)) {
- Scanner s = connector.createScanner(table, new Authorizations());
- s.setRange(new Range());
- Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
- for (Entry<Key,Value> entry : s) {
- actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+ Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
+ expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
+ expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
+ expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
+ expectations.put(Maps.immutableEntry("bar", "col2"), "val2");
+
+ for (String table : Arrays.asList(newTable1, newTable2)) {
+ Scanner s = connector.createScanner(table, new Authorizations());
+ s.setRange(new Range());
+ Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
+ for (Entry<Key,Value> entry : s) {
+ actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+ }
+
+ Assert.assertEquals("Differing results for " + table, expectations, actual);
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
}
-
- Assert.assertEquals("Differing results for " + table, expectations, actual);
}
}
@@ -132,53 +138,59 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 60, TimeUnit.MINUTES);
- final String table1 = "testTableRenameNewWriters_table1", table2 = "testTableRenameNewWriters_table2";
- final String newTable1 = "testTableRenameNewWriters_newTable1", newTable2 = "testTableRenameNewWriters_newTable2";
-
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ try {
+ final String table1 = "testTableRenameNewWriters_table1", table2 = "testTableRenameNewWriters_table2";
+ final String newTable1 = "testTableRenameNewWriters_newTable1", newTable2 = "testTableRenameNewWriters_newTable2";
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- tops.rename(table1, newTable1);
- tops.rename(table2, newTable2);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- // MTBW is still caching this name to the correct table
- bw1 = mtbw.getBatchWriter(table1);
- bw2 = mtbw.getBatchWriter(table2);
+ tops.rename(table1, newTable1);
+ tops.rename(table2, newTable2);
- Mutation m2 = new Mutation("bar");
- m2.put("col1", "", "val1");
- m2.put("col2", "", "val2");
+ // MTBW is still caching this name to the correct table
+ bw1 = mtbw.getBatchWriter(table1);
+ bw2 = mtbw.getBatchWriter(table2);
- bw1.addMutation(m2);
- bw2.addMutation(m2);
+ Mutation m2 = new Mutation("bar");
+ m2.put("col1", "", "val1");
+ m2.put("col2", "", "val2");
- mtbw.close();
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
- Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
- expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
- expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
- expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
- expectations.put(Maps.immutableEntry("bar", "col2"), "val2");
+ mtbw.close();
- for (String table : Arrays.asList(newTable1, newTable2)) {
- Scanner s = connector.createScanner(table, new Authorizations());
- s.setRange(new Range());
- Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
- for (Entry<Key,Value> entry : s) {
- actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+ Map<Entry<String,String>,String> expectations = new HashMap<Entry<String,String>,String>();
+ expectations.put(Maps.immutableEntry("foo", "col1"), "val1");
+ expectations.put(Maps.immutableEntry("foo", "col2"), "val2");
+ expectations.put(Maps.immutableEntry("bar", "col1"), "val1");
+ expectations.put(Maps.immutableEntry("bar", "col2"), "val2");
+
+ for (String table : Arrays.asList(newTable1, newTable2)) {
+ Scanner s = connector.createScanner(table, new Authorizations());
+ s.setRange(new Range());
+ Map<Entry<String,String>,String> actual = new HashMap<Entry<String,String>,String>();
+ for (Entry<Key,Value> entry : s) {
+ actual.put(Maps.immutableEntry(entry.getKey().getRow().toString(), entry.getKey().getColumnFamily().toString()), entry.getValue().toString());
+ }
+
+ Assert.assertEquals("Differing results for " + table, expectations, actual);
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
}
-
- Assert.assertEquals("Differing results for " + table, expectations, actual);
}
}
@@ -191,36 +203,42 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 0, TimeUnit.SECONDS);
- final String table1 = "testTableRenameNewWritersNoCaching_table1", table2 = "testTableRenameNewWritersNoCaching_table2";
- final String newTable1 = "testTableRenameNewWritersNoCaching_newTable1", newTable2 = "testTableRenameNewWritersNoCaching_newTable2";
+ try {
+ final String table1 = "testTableRenameNewWritersNoCaching_table1", table2 = "testTableRenameNewWritersNoCaching_table2";
+ final String newTable1 = "testTableRenameNewWritersNoCaching_newTable1", newTable2 = "testTableRenameNewWritersNoCaching_newTable2";
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- tops.rename(table1, newTable1);
- tops.rename(table2, newTable2);
+ tops.rename(table1, newTable1);
+ tops.rename(table2, newTable2);
- try {
- bw1 = mtbw.getBatchWriter(table1);
- Assert.fail("Should not have gotten batchwriter for " + table1);
- } catch (TableNotFoundException e) {
- // Pass
- }
+ try {
+ bw1 = mtbw.getBatchWriter(table1);
+ Assert.fail("Should not have gotten batchwriter for " + table1);
+ } catch (TableNotFoundException e) {
+ // Pass
+ }
- try {
- bw2 = mtbw.getBatchWriter(table2);
- } catch (TableNotFoundException e) {
- // Pass
+ try {
+ bw2 = mtbw.getBatchWriter(table2);
+ } catch (TableNotFoundException e) {
+ // Pass
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
+ }
}
}
@@ -233,36 +251,42 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 60, TimeUnit.MINUTES);
- final String table1 = "testTableDelete_table1", table2 = "testTableDelete_table2";
+ try {
+ final String table1 = "testTableDelete_table1", table2 = "testTableDelete_table2";
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- tops.delete(table1);
- tops.delete(table2);
+ tops.delete(table1);
+ tops.delete(table2);
- Mutation m2 = new Mutation("bar");
- m2.put("col1", "", "val1");
- m2.put("col2", "", "val2");
+ Mutation m2 = new Mutation("bar");
+ m2.put("col1", "", "val1");
+ m2.put("col2", "", "val2");
- bw1.addMutation(m2);
- bw2.addMutation(m2);
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
- try {
- mtbw.close();
- Assert.fail("Should not be able to close batch writers");
- } catch (MutationsRejectedException e) {
- // Pass
+ try {
+ mtbw.close();
+ Assert.fail("Should not be able to close batch writers");
+ } catch (MutationsRejectedException e) {
+ // Pass
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
+ }
}
}
@@ -276,36 +300,43 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 60, TimeUnit.MINUTES);
- final String table1 = "testOfflineTable_table1", table2 = "testOfflineTable_table2";
+ try {
+ final String table1 = "testOfflineTable_table1", table2 = "testOfflineTable_table2";
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- tops.offline(table1);
- tops.offline(table2);
+ tops.offline(table1);
+ tops.offline(table2);
- Mutation m2 = new Mutation("bar");
- m2.put("col1", "", "val1");
- m2.put("col2", "", "val2");
+ Mutation m2 = new Mutation("bar");
+ m2.put("col1", "", "val1");
+ m2.put("col2", "", "val2");
- bw1.addMutation(m2);
- bw2.addMutation(m2);
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
+
+ try {
+ mtbw.close();
+ Assert.fail("Should not be able to close batch writers");
+ } catch (MutationsRejectedException e) {
+ // Pass
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
+ }
- try {
- mtbw.close();
- Assert.fail("Should not be able to close batch writers");
- } catch (MutationsRejectedException e) {
- // Pass
}
}
@@ -319,39 +350,45 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 60, TimeUnit.MINUTES);
- final String table1 = "testOfflineTableWithCache_table1", table2 = "testOfflineTableWithCache_table2";
+ try {
+ final String table1 = "testOfflineTableWithCache_table1", table2 = "testOfflineTableWithCache_table2";
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- tops.offline(table1);
- tops.offline(table2);
+ tops.offline(table1);
+ tops.offline(table2);
- bw1 = mtbw.getBatchWriter(table1);
- bw2 = mtbw.getBatchWriter(table2);
+ bw1 = mtbw.getBatchWriter(table1);
+ bw2 = mtbw.getBatchWriter(table2);
- Mutation m2 = new Mutation("bar");
- m2.put("col1", "", "val1");
- m2.put("col2", "", "val2");
+ Mutation m2 = new Mutation("bar");
+ m2.put("col1", "", "val1");
+ m2.put("col2", "", "val2");
- bw1.addMutation(m2);
- bw2.addMutation(m2);
+ bw1.addMutation(m2);
+ bw2.addMutation(m2);
- try {
- mtbw.close();
- Assert.fail("Should not be able to close batch writers");
- } catch (MutationsRejectedException e) {
- // Pass
+ try {
+ mtbw.close();
+ Assert.fail("Should not be able to close batch writers");
+ } catch (MutationsRejectedException e) {
+ // Pass
+ }
+ } finally {
+ if (null != mtbw) {
+ mtbw.close();
+ }
}
}
@@ -365,37 +402,47 @@ public class MultiTableBatchWriterTest {
MultiTableBatchWriter mtbw = connector.createMultiTableBatchWriter(config, 0, TimeUnit.MINUTES);
- final String table1 = "testOfflineTableWithoutCache_table1", table2 = "testOfflineTableWithoutCache_table2";
+ try {
+ final String table1 = "testOfflineTableWithoutCache_table1", table2 = "testOfflineTableWithoutCache_table2";
- TableOperations tops = connector.tableOperations();
- tops.create(table1);
- tops.create(table2);
+ TableOperations tops = connector.tableOperations();
+ tops.create(table1);
+ tops.create(table2);
- BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
+ BatchWriter bw1 = mtbw.getBatchWriter(table1), bw2 = mtbw.getBatchWriter(table2);
- Mutation m1 = new Mutation("foo");
- m1.put("col1", "", "val1");
- m1.put("col2", "", "val2");
+ Mutation m1 = new Mutation("foo");
+ m1.put("col1", "", "val1");
+ m1.put("col2", "", "val2");
- bw1.addMutation(m1);
- bw2.addMutation(m1);
+ bw1.addMutation(m1);
+ bw2.addMutation(m1);
- tops.offline(table1);
- tops.offline(table2);
+ tops.offline(table1);
+ tops.offline(table2);
- try {
- bw1 = mtbw.getBatchWriter(table1);
- Assert.fail(table1 + " should be offline");
- } catch (UncheckedExecutionException e) {
- Assert.assertEquals(TableOfflineException.class, e.getCause().getClass());
- }
+ try {
+ bw1 = mtbw.getBatchWriter(table1);
+ Assert.fail(table1 + " should be offline");
+ } catch (UncheckedExecutionException e) {
+ Assert.assertEquals(TableOfflineException.class, e.getCause().getClass());
+ }
- try {
- bw2 = mtbw.getBatchWriter(table2);
- Assert.fail(table1 + " should be offline");
- } catch (UncheckedExecutionException e) {
- Assert.assertEquals(TableOfflineException.class, e.getCause().getClass());
+ try {
+ bw2 = mtbw.getBatchWriter(table2);
+ Assert.fail(table1 + " should be offline");
+ } catch (UncheckedExecutionException e) {
+ Assert.assertEquals(TableOfflineException.class, e.getCause().getClass());
+ }
+ } finally {
+ if (null != mtbw) {
+ try {
+ mtbw.close();
+ Assert.fail("Expecting close on MTBW to fail due to offline tables");
+ } catch (MutationsRejectedException e) {
+ // Pass
+ }
+ }
}
}
-
}