hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1561119 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
Date Fri, 24 Jan 2014 19:08:21 GMT
Author: tedyu
Date: Fri Jan 24 19:08:21 2014
New Revision: 1561119

URL: http://svn.apache.org/r1561119
Log:
HBASE-10408 Intermittent TestDistributedLogSplitting#testLogReplayForDisablingTable failure


Modified:
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java?rev=1561119&r1=1561118&r2=1561119&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
Fri Jan 24 19:08:21 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);
       }
     });
 



Mime
View raw message