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/10/29 18:33:54 UTC
git commit: ACCUMULO-1825 Change up the comparisons on as we were
getting a lot of churn from the metadata and root tables.
Updated Branches:
refs/heads/master 71934fb42 -> 219560a9a
ACCUMULO-1825 Change up the comparisons on as we were getting a lot of
churn from the metadata and root tables.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/219560a9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/219560a9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/219560a9
Branch: refs/heads/master
Commit: 219560a9a85beeeba16e79ae5acf3f2d14b27b1c
Parents: 71934fb
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 29 13:32:30 2013 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Oct 29 13:33:42 2013 -0400
----------------------------------------------------------------------
.../minicluster/MiniAccumuloClusterGCTest.java | 30 ++++++++++++++------
1 file changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/219560a9/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
----------------------------------------------------------------------
diff --git a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
index 7888f32..cac9032 100644
--- a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
+++ b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterGCTest.java
@@ -45,7 +45,8 @@ import com.google.common.collect.ImmutableMap;
*
*/
public class MiniAccumuloClusterGCTest {
-
+ private static final Logger log = Logger.getLogger(MiniAccumuloClusterGCTest.class);
+
private static File testDir = new File(System.getProperty("user.dir") + "/target/" + MiniAccumuloClusterGCTest.class.getName());
private static MiniAccumuloConfig macConfig;
private static MiniAccumuloCluster accumulo;
@@ -83,14 +84,16 @@ public class MiniAccumuloClusterGCTest {
final String table = "foobar";
c.tableOperations().create(table);
+
+ final String tableId = c.tableOperations().tableIdMap().get(table);
BatchWriter bw = null;
// Add some data
try {
- bw = c.createBatchWriter(table, new BatchWriterConfig().setMaxMemory(1000l).setMaxLatency(100, TimeUnit.MILLISECONDS).setMaxWriteThreads(1));
+ bw = c.createBatchWriter(table, new BatchWriterConfig().setMaxMemory(100000l).setMaxLatency(100, TimeUnit.MILLISECONDS).setMaxWriteThreads(1));
Mutation m = new Mutation("a");
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < 500; i++) {
m.put("colf", Integer.toString(i), "");
}
@@ -101,21 +104,30 @@ public class MiniAccumuloClusterGCTest {
}
}
+ File accumuloDir = new File(testDir, "accumulo");
+ File tables = new File(accumuloDir.getAbsolutePath(), "tables");
+ File myTable = new File(tables, tableId);
+
+ log.trace("Files before compaction: " + FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE));
+
final boolean flush = true, wait = true;
// Compact the tables to get some rfiles which we can gc
c.tableOperations().compact(table, null, null, flush, wait);
- c.tableOperations().compact(MetadataTable.NAME, null, null, flush, wait);
-
- File accumuloDir = new File(testDir, "accumulo");
- File tables = new File(accumuloDir.getAbsolutePath(), "tables");
- int fileCountAfterCompaction = FileUtils.listFiles(tables, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE).size();
+ Collection<File> filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
+ int fileCountAfterCompaction = filesAfterCompaction.size();
+
+ log.trace("Files after compaction: " + filesAfterCompaction);
// Sleep for 10s to let the GC do its thing
for (int i = 1; i < 10; i++) {
Thread.sleep(1000);
- int fileCountAfterGCWait = FileUtils.listFiles(tables, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE).size();
+ filesAfterCompaction = FileUtils.listFiles(myTable, new SuffixFileFilter(".rf"), TrueFileFilter.TRUE);
+
+ log.trace("Files in loop: " + filesAfterCompaction);
+
+ int fileCountAfterGCWait = filesAfterCompaction.size();
if (fileCountAfterGCWait < fileCountAfterCompaction) {
return;