hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r952837 - in /hbase/trunk: CHANGES.txt src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java
Date Tue, 08 Jun 2010 21:59:13 GMT
Author: jdcryans
Date: Tue Jun  8 21:59:13 2010
New Revision: 952837

URL: http://svn.apache.org/viewvc?rev=952837&view=rev
Log:
HBASE-2684 TestMasterWrongRS flaky in trunk

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=952837&r1=952836&r2=952837&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Jun  8 21:59:13 2010
@@ -378,6 +378,7 @@ Release 0.21.0 - Unreleased
    HBASE-2615  M/R on bulk imported tables
    HBASE-2676  TestInfoServers should use ephemeral ports
    HBASE-2616  TestHRegion.testWritesWhileGetting flaky on trunk
+   HBASE-2684  TestMasterWrongRS flaky in trunk
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java?rev=952837&r1=952836&r2=952837&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/master/TestMasterWrongRS.java Tue Jun
 8 21:59:13 2010
@@ -53,7 +53,7 @@ public class TestMasterWrongRS {
    * See HBASE-2613
    * @throws Exception
    */
-  @Test
+  @Test (timeout=180000)
   public void testRsReportsWrongServerName() throws Exception {
     MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
     MiniHBaseClusterRegionServer firstServer =
@@ -62,14 +62,12 @@ public class TestMasterWrongRS {
     HServerInfo hsi = firstServer.getServerInfo();
     firstServer.setHServerInfo(new HServerInfo(hsi.getServerAddress(),
       hsi.getInfoPort(), hsi.getHostname()));
-    // Sleep while the region server pings back
-    Thread.sleep(2000);
-    assertTrue(firstServer.isOnline());
+
+    cluster.waitOnRegionServer(0);
     assertEquals(2, cluster.getLiveRegionServerThreads().size());
 
     secondServer.getHServerInfo().setServerAddress(new HServerAddress("0.0.0.0", 60010));
-    Thread.sleep(2000);
-    assertTrue(secondServer.isOnline());
+    cluster.waitOnRegionServer(0);
     assertEquals(1, cluster.getLiveRegionServerThreads().size());
   }
 }



Mime
View raw message