Index: hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java (revision 1377368) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java (working copy) @@ -57,10 +57,12 @@ 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 @@ 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); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java =================================================================== Index: hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java (revision 1377368) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java (working copy) @@ -51,13 +51,15 @@ 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 @@ 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);