Index: hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (revision 1561083) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (working copy) @@ -739,16 +739,15 @@ HRegionServer hrs = null; boolean hasRegionsForBothTables = false; String tableName = null; + OUTER: for (int i = 0; i < NUM_RS; i++) { tableName = null; hasRegionsForBothTables = false; - boolean isCarryingMeta = false; hrs = rsts.get(i).getRegionServer(); regions = ProtobufUtil.getOnlineRegions(hrs); for (HRegionInfo region : regions) { - if (region.isMetaRegion()) { - isCarryingMeta = true; - break; + if (region.getTable().isSystemTable()) { + continue OUTER; } if (tableName != null && !tableName.equalsIgnoreCase(region.getTable().getNameAsString())) { @@ -759,9 +758,6 @@ tableName = region.getTable().getNameAsString(); } } - if (isCarryingMeta) { - continue; - } if (hasRegionsForBothTables) { break; } @@ -810,7 +806,9 @@ public boolean evaluate() throws Exception { List 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); } });