hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-14327 TestIOFencing#testFencingAroundCompactionAfterWALSync is flaky (Heng Chen)
Date Fri, 04 Sep 2015 17:32:17 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 1e411c8ea -> 2c4062ae0


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/2c4062ae
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2c4062ae
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2c4062ae

Branch: refs/heads/branch-1.2
Commit: 2c4062ae0ef87fabb7af5d367f8cfdbef266657d
Parents: 1e411c8
Author: stack <stack@apache.org>
Authored: Fri Sep 4 10:27:49 2015 -0700
Committer: stack <stack@apache.org>
Committed: Fri Sep 4 10:31:59 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/2c4062ae/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 659e396..41e7ec5 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
@@ -321,6 +321,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) {
@@ -329,12 +335,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