svn commit: r1377508 - in /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase: TestMultiVersions.java io/encoding/TestUpgradeFromHFileV1ToEncoding.java

[te...@apache.org]

Author: tedyu
Date: Sun Aug 26 20:11:21 2012
New Revision: 1377508

URL: http://svn.apache.org/viewvc?rev=1377508&view=rev
Log:
HBASE-6622 TestUpgradeFromHFileV1ToEncoding#testUpgrade fails in trunk


Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java?rev=1377508&r1=1377507&r2=1377508&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java Sun Aug 26 20:11:21 2012
@@ -57,10 +57,12 @@ public class TestMultiVersions {
   private static final Log LOG = LogFactory.getLog(TestMultiVersions.class);
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
   private HBaseAdmin admin;
+  
+  private static final int NUM_SLAVES = 3;
 
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
-    UTIL.startMiniCluster();
+    UTIL.startMiniCluster(NUM_SLAVES);
   }
 
   @AfterClass
@@ -140,7 +142,7 @@ public class TestMultiVersions {
     table.close();
     UTIL.shutdownMiniHBaseCluster();
     LOG.debug("HBase cluster shut down -- restarting");
-    UTIL.startMiniHBaseCluster(1, 1);
+    UTIL.startMiniHBaseCluster(1, NUM_SLAVES);
     // Make a new connection.  Use new Configuration instance because old one
     // is tied to an HConnection that has since gone stale.
     table = new HTable(new Configuration(UTIL.getConfiguration()), tableName);

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java?rev=1377508&r1=1377507&r2=1377508&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java Sun Aug 26 20:11:21 2012
@@ -51,13 +51,15 @@ public class TestUpgradeFromHFileV1ToEnc
 
   private static final int NUM_HFILE_V1_BATCHES = 10;
   private static final int NUM_HFILE_V2_BATCHES = 20;
+  
+  private static final int NUM_SLAVES = 3;
 
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     // Use a small flush size to create more HFiles.
     conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024 * 1024);
     conf.setInt(HFile.FORMAT_VERSION_KEY, 1); // Use HFile v1 initially
-    TEST_UTIL.startMiniCluster();
+    TEST_UTIL.startMiniCluster(NUM_SLAVES);
     LOG.debug("Started an HFile v1 cluster");
   }
 
@@ -81,7 +83,7 @@ public class TestUpgradeFromHFileV1ToEnc
     TEST_UTIL.shutdownMiniHBaseCluster();
 
     conf.setInt(HFile.FORMAT_VERSION_KEY, 2);
-    TEST_UTIL.startMiniHBaseCluster(1, 1);
+    TEST_UTIL.startMiniHBaseCluster(1, NUM_SLAVES);
     LOG.debug("Started an HFile v2 cluster");
     admin = new HBaseAdmin(conf);
     htd = admin.getTableDescriptor(TABLE_BYTES);