Return-Path: Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: (qmail 28222 invoked from network); 8 Jun 2010 21:59:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Jun 2010 21:59:34 -0000 Received: (qmail 27896 invoked by uid 500); 8 Jun 2010 21:59:34 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 27872 invoked by uid 500); 8 Jun 2010 21:59:34 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 27865 invoked by uid 99); 8 Jun 2010 21:59:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jun 2010 21:59:34 +0000 X-ASF-Spam-Status: No, hits=-1338.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jun 2010 21:59:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D7E07238899C; Tue, 8 Jun 2010 21:59:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@hbase.apache.org From: jdcryans@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100608215913.D7E07238899C@eris.apache.org> 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()); } }