svn commit: r1481226 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java

[te...@apache.org]

Author: tedyu
Date: Fri May 10 22:40:50 2013
New Revision: 1481226

URL: http://svn.apache.org/r1481226
Log:
HBASE-8520 TestIOFencing fails intermittently due to compaction kicking in too soon (Ted Yu)


Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java?rev=1481226&r1=1481225&r2=1481226&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java Fri May 10 22:40:50 2013
@@ -240,16 +240,16 @@ public class TestIOFencing {
       TEST_UTIL.createTable(TABLE_NAME, FAMILY);
       HTable table = new HTable(c, TABLE_NAME);
       LOG.info("Loading test table");
-      // Load some rows
-      TEST_UTIL.loadNumericRows(table, FAMILY, 0, FIRST_BATCH_COUNT);
       // Find the region
       List<HRegion> testRegions = TEST_UTIL.getMiniHBaseCluster().findRegionsForTable(TABLE_NAME);
       assertEquals(1, testRegions.size());
       compactingRegion = (CompactionBlockerRegion)testRegions.get(0);
-      assertTrue(compactingRegion.countStoreFiles() > 1);
-      final byte REGION_NAME[] = compactingRegion.getRegionName();
       LOG.info("Blocking compactions");
       compactingRegion.stopCompactions();
+      // Load some rows
+      TEST_UTIL.loadNumericRows(table, FAMILY, 0, FIRST_BATCH_COUNT);
+      assertTrue(compactingRegion.countStoreFiles() > 1);
+      final byte REGION_NAME[] = compactingRegion.getRegionName();
       LOG.info("Asking for compaction");
       admin.majorCompact(TABLE_NAME);
       LOG.info("Waiting for compaction to be about to start");
@@ -300,4 +300,4 @@ public class TestIOFencing {
       TEST_UTIL.shutdownMiniCluster();
     }
   }
-}
\ No newline at end of file
+}