You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/01/24 20:07:43 UTC
svn commit: r1561118 -
/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
Author: tedyu
Date: Fri Jan 24 19:07:43 2014
New Revision: 1561118
URL: http://svn.apache.org/r1561118
Log:
HBASE-10408 Intermittent TestDistributedLogSplitting#testLogReplayForDisablingTable failure
Modified:
hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1561118&r1=1561117&r2=1561118&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java (original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java Fri Jan 24 19:07:43 2014
@@ -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);
}
});