hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jxi...@apache.org
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 GMT
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<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));
     }



Mime
View raw message