svn commit: r1591042 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java

[li...@apache.org]

Author: liyin
Date: Tue Apr 29 18:18:39 2014
New Revision: 1591042

URL: http://svn.apache.org/r1591042
Log:
[master] Make TestUpgradeFromHFileV1ToEncoding stable

Author: elliott

Summary: Made TestUpgradeFromHFileV1ToEncoding spin up fewer region servers, and made the timout longer while writing less data.

Test Plan: bin/test/loop_tests.sh -t TestUpgradeFromHFileV1ToEncoding

Reviewers: daviddeng

Reviewed By: daviddeng

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D1300258

Task ID: 4191835

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java?rev=1591042&r1=1591041&r2=1591042&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/io/encoding/TestUpgradeFromHFileV1ToEncoding.java Tue Apr 29 18:18:39 2014
@@ -47,14 +47,14 @@ public class TestUpgradeFromHFileV1ToEnc
   private static final Configuration conf = TEST_UTIL.getConfiguration();
 
   private static final int NUM_HFILE_V1_BATCHES = 10;
-  private static final int NUM_HFILE_V2_BATCHES = 20;
+  private static final int NUM_HFILE_V2_BATCHES = 10;
 
   @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(1,1);
     LOG.debug("Started an HFile v1 cluster");
   }
 
@@ -63,7 +63,7 @@ public class TestUpgradeFromHFileV1ToEnc
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @Test(timeout=180000)
+  @Test(timeout=240000)
   public void testUpgrade() throws Exception {
     int numBatches = 0;
     HTableDescriptor htd = new HTableDescriptor(TABLE);