hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-14327 TestIOFencing#testFencingAroundCompactionAfterWALSync is flaky (Heng Chen)
Date Sat, 05 Sep 2015 22:02:45 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 9f73d722e -> 4367a94aa


HBASE-14327 TestIOFencing#testFencingAroundCompactionAfterWALSync is flaky (Heng Chen)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4367a94a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4367a94a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4367a94a

Branch: refs/heads/0.98
Commit: 4367a94aa9d1a0d33a38b65f098f8a21ffc68fd5
Parents: 9f73d72
Author: stack <stack@apache.org>
Authored: Fri Sep 4 10:27:49 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Sat Sep 5 14:57:20 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/TestIOFencing.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4367a94a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
index 6fe1a2b..b01f738 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
@@ -311,6 +311,12 @@ public class TestIOFencing {
 
       newRegion = (CompactionBlockerRegion)newServer.getOnlineRegion(REGION_NAME);
 
+      // After compaction of old region finishes on the server that was going down, make
sure that
+      // all the files we expect are still working when region is up in new location.
+      FileSystem fs = newRegion.getFilesystem();
+      for (String f: newRegion.getStoreFileList(new byte [][] {FAMILY})) {
+        assertTrue("After compaction, does not exist: " + f, fs.exists(new Path(f)));
+      }
       LOG.info("Allowing compaction to proceed");
       compactingRegion.allowCompactions();
       while (compactingRegion.compactCount == 0) {
@@ -319,12 +325,7 @@ public class TestIOFencing {
       // The server we killed stays up until the compaction that was started before it was
killed completes.  In logs
       // you should see the old regionserver now going down.
       LOG.info("Compaction finished");
-      // After compaction of old region finishes on the server that was going down, make
sure that
-      // all the files we expect are still working when region is up in new location.
-      FileSystem fs = newRegion.getFilesystem();
-      for (String f: newRegion.getStoreFileList(new byte [][] {FAMILY})) {
-        assertTrue("After compaction, does not exist: " + f, fs.exists(new Path(f)));
-      }
+
       // If we survive the split keep going...
       // Now we make sure that the region isn't totally confused.  Load up more rows.
       TEST_UTIL.loadNumericRows(table, FAMILY, FIRST_BATCH_COUNT, FIRST_BATCH_COUNT + SECOND_BATCH_COUNT);


Mime
View raw message