hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject svn commit: r1584950 - in /hbase/branches/0.98/hbase-server/src: main/java/org/apache/hadoop/hbase/master/AssignmentManager.java test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
Date Sat, 05 Apr 2014 01:23:17 GMT
Author: jeffreyz
Date: Sat Apr  5 01:23:16 2014
New Revision: 1584950

URL: http://svn.apache.org/r1584950
Log:
HBASE-10895: unassign a region fails due to the hosting region server is in FailedServerList
- part2

Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1584950&r1=1584949&r2=1584950&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Sat Apr  5 01:23:16 2014
@@ -1698,8 +1698,7 @@ public class AssignmentManager extends Z
         boolean logRetries = true;
         if (t instanceof NotServingRegionException
             || t instanceof RegionServerStoppedException
-            || t instanceof ServerNotRunningYetException
-            || t instanceof FailedServerException) {
+            || t instanceof ServerNotRunningYetException) {
           LOG.debug("Offline " + region.getRegionNameAsString()
             + ", it's not any more on " + server, t);
           if (transitionInZK) {

Modified: hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java?rev=1584950&r1=1584949&r2=1584950&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
(original)
+++ hbase/branches/0.98/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
Sat Apr  5 01:23:16 2014
@@ -754,11 +754,11 @@ public class TestAssignmentManagerOnClus
       // You can't assign a dead region before SSH
       am.assign(hri, true, true);
       RegionState state = regionStates.getRegionState(hri);
-      assertTrue(state.isOffline());
+      assertTrue(state.isFailedClose());
 
       // You can't unassign a dead region before SSH either
       am.unassign(hri, true);
-      assertTrue(state.isOffline());
+      assertTrue(state.isFailedClose());
 
       // Enable SSH so that log can be split
       master.enableSSH(true);



Mime
View raw message