svn commit: r1508145 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java

[jxiang]

Author: jxiang
Date: Mon Jul 29 17:34:03 2013
New Revision: 1508145

URL: http://svn.apache.org/r1508145
Log:
HBASE-9063 
TestAssignmentManagerOnCluster.testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState
 fails

Modified:
    
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java?rev=1508145&r1=1508144&r2=1508145&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
 Mon Jul 29 17:34:03 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<HRegionInfo> 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));
     }