Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-9063 TestAssignmentManagerOnCluster.testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState fails 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1508145 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jxiang 2013-07-29 17:34:03 +00:00
parent 342b69f497
commit f7de23fb90
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
View File

@ -258,7 +258,7 @@ public class TestAssignmentManagerOnCluster {
// wait till the table is assigned // wait till the table is assigned
HMaster master = TEST_UTIL.getHBaseCluster().getMaster(); HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
long timeoutTime = System.currentTimeMillis() + 100; long timeoutTime = System.currentTimeMillis() + 1000;
while (true) { while (true) {
List<HRegionInfo> regions = master.getAssignmentManager(). List<HRegionInfo> regions = master.getAssignmentManager().
getRegionStates().getRegionsOfTable(Bytes.toBytes(tableName)); getRegionStates().getRegionsOfTable(Bytes.toBytes(tableName));
@ -449,7 +449,7 @@ public class TestAssignmentManagerOnCluster {
TEST_UTIL.deleteTable(Bytes.toBytes(table)); TEST_UTIL.deleteTable(Bytes.toBytes(table));
} }
} }
@Test (timeout=60000) @Test (timeout=60000)
public void testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState() throws Exception { public void testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState() throws Exception {
final String table = "testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState"; final String table = "testSSHWhenDisablingTableRegionsInOpeningOrPendingOpenState";
@ -479,7 +479,9 @@ public class TestAssignmentManagerOnCluster {
assertTrue("Regions to be assigned should be empty.", am.getRegionStates() assertTrue("Regions to be assigned should be empty.", am.getRegionStates()
.getRegionState(hri).isOffline()); .getRegionState(hri).isOffline());
} finally { } finally {
am.regionOnline(hri, serverName); if (hri != null && serverName != null) {
am.regionOnline(hri, serverName);
}
am.getZKTable().setDisabledTable(table); am.getZKTable().setDisabledTable(table);
TEST_UTIL.deleteTable(Bytes.toBytes(table)); TEST_UTIL.deleteTable(Bytes.toBytes(table));
} }