.../apache/hadoop/hbase/regionserver/TestHRegion.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 1edc251..e838617 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -3864,6 +3864,9 @@ public class TestHRegion { if (i != 0 && i % compactInterval == 0) { region.compact(true); + for (Store store : region.getStores()) { + store.closeAndArchiveCompactedFiles(); + } } if (i != 0 && i % flushInterval == 0) { @@ -4031,19 +4034,15 @@ public class TestHRegion { // Add a thread that flushes as fast as possible ctx.addThread(new RepeatingTestThread(ctx) { - private int flushesSinceCompact = 0; - private final int maxFlushesSinceCompact = 20; @Override public void doAnAction() throws Exception { - if (region.flush(true).isCompactionNeeded()) { - ++flushesSinceCompact; - } + region.flush(true); // Compact regularly to avoid creating too many files and exceeding // the ulimit. - if (flushesSinceCompact == maxFlushesSinceCompact) { - region.compact(false); - flushesSinceCompact = 0; + region.compact(false); + for (Store store : region.getStores()) { + store.closeAndArchiveCompactedFiles(); } } }); @@ -4056,7 +4055,7 @@ public class TestHRegion { long prevTimestamp = 0L; for (int i = 0; i < testCount; i++) { - + LOG.info("testWritesWhileGetting verify turn " + i); boolean previousEmpty = result == null || result.isEmpty(); result = region.get(get); if (!result.isEmpty() || !previousEmpty || i > compactInterval) {