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

HBASE-10408 Intermittent TestDistributedLogSplitting#testLogReplayForDisablingTable failure 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1561119 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2014-01-24 19:08:21 +00:00
parent bf5c9ad1f4
commit d3cb5d2f3e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
View File

@ -742,12 +742,12 @@ public class TestDistributedLogSplitting {
for (int i = 0; i < NUM_RS; i++) {
tableName = null;
hasRegionsForBothTables = false;
boolean isCarryingMeta = false;
boolean isCarryingSystem = false;
hrs = rsts.get(i).getRegionServer();
regions = ProtobufUtil.getOnlineRegions(hrs);
for (HRegionInfo region : regions) {
if (region.isMetaRegion()) {
isCarryingMeta = true;
if (region.getTable().isSystemTable()) {
isCarryingSystem = true;
break;
}
if (tableName != null &&
@ -759,7 +759,7 @@ public class TestDistributedLogSplitting {
tableName = region.getTable().getNameAsString();
}
}
if (isCarryingMeta) {
if (isCarryingSystem) {
continue;
}
if (hasRegionsForBothTables) {
@ -810,7 +810,9 @@ public class TestDistributedLogSplitting {
public boolean evaluate() throws Exception {
List<String> recoveringRegions = zkw.getRecoverableZooKeeper().getChildren(
zkw.recoveringRegionsZNode, false);
return (recoveringRegions != null && recoveringRegions.size() == 0);
ServerManager serverManager = master.getServerManager();
return (!serverManager.areDeadServersInProgress() &&
recoveringRegions != null && recoveringRegions.size() == 0);
}
});