hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1344512 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Date Thu, 31 May 2012 00:00:04 GMT
Author: stack
Date: Thu May 31 00:00:04 2012
New Revision: 1344512

URL: http://svn.apache.org/viewvc?rev=1344512&view=rev
Log:
HBASE-6016 ServerShutdownHandler#processDeadRegion could return false for disabling table
regions

Modified:
    hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1344512&r1=1344511&r2=1344512&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
(original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Thu May 31 00:00:04 2012
@@ -336,8 +336,8 @@ public class ServerShutdownHandler exten
   }
 
   /**
-   * Process a dead region from a dead RS.  Checks if the region is disabled
-   * or if the region has a partially completed split.
+   * Process a dead region from a dead RS. Checks if the region is disabled or
+   * disabling or if the region has a partially completed split.
    * @param hri
    * @param result
    * @param assignmentManager
@@ -372,6 +372,13 @@ public class ServerShutdownHandler exten
       fixupDaughters(result, assignmentManager, catalogTracker);
       return false;
     }
+    boolean disabling = assignmentManager.getZKTable().isDisablingTable(
+        hri.getTableNameAsString());
+    if (disabling) {
+      LOG.info("The table " + hri.getTableNameAsString()
+          + " is disabled.  Hence not assigning region" + hri.getEncodedName());
+      return false;
+    }
     return true;
   }
 



Mime
View raw message