Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5067C10A44 for ; Mon, 29 Jul 2013 17:34:50 +0000 (UTC) Received: (qmail 29997 invoked by uid 500); 29 Jul 2013 17:34:50 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 29966 invoked by uid 500); 29 Jul 2013 17:34:49 -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 29959 invoked by uid 99); 29 Jul 2013 17:34:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jul 2013 17:34:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Mon, 29 Jul 2013 17:34:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B3618238889B; Mon, 29 Jul 2013 17:34:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1508146 - /hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java Date: Mon, 29 Jul 2013 17:34:26 -0000 To: commits@hbase.apache.org From: jxiang@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130729173426.B3618238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jxiang Date: Mon Jul 29 17:34:26 2013 New Revision: 1508146 URL: http://svn.apache.org/r1508146 Log: HBASE-9063 TestAssignmentManagerOnCluster.testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState fails Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java?rev=1508146&r1=1508145&r2=1508146&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java (original) +++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java Mon Jul 29 17:34:26 2013 @@ -258,7 +258,7 @@ public class TestAssignmentManagerOnClus // wait till the table is assigned HMaster master = TEST_UTIL.getHBaseCluster().getMaster(); - long timeoutTime = System.currentTimeMillis() + 100; + long timeoutTime = System.currentTimeMillis() + 1000; while (true) { List regions = master.getAssignmentManager(). getRegionStates().getRegionsOfTable(Bytes.toBytes(tableName)); @@ -449,7 +449,7 @@ public class TestAssignmentManagerOnClus TEST_UTIL.deleteTable(Bytes.toBytes(table)); } } - + @Test (timeout=60000) public void testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState() throws Exception { final String table = "testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState"; @@ -479,7 +479,9 @@ public class TestAssignmentManagerOnClus assertTrue("Regions to be assigned should be empty.", am.getRegionStates() .getRegionState(hri).isOffline()); } finally { - am.regionOnline(hri, serverName); + if (hri != null && serverName != null) { + am.regionOnline(hri, serverName); + } am.getZKTable().setDisabledTable(table); TEST_UTIL.deleteTable(Bytes.toBytes(table)); }