HBASE-6016 ServerShutdownHandler#processDeadRegion could return false for disabling table regions

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1344511 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2012-05-30 23:59:40 +00:00
parent 17a12aa8e5
commit bf1470c6c7
1 changed files with 9 additions and 2 deletions

View File

@ -348,8 +348,8 @@ public class ServerShutdownHandler extends EventHandler {
} }
/** /**
* Process a dead region from a dead RS. Checks if the region is disabled * Process a dead region from a dead RS. Checks if the region is disabled or
* or if the region has a partially completed split. * disabling or if the region has a partially completed split.
* @param hri * @param hri
* @param result * @param result
* @param assignmentManager * @param assignmentManager
@ -384,6 +384,13 @@ public class ServerShutdownHandler extends EventHandler {
fixupDaughters(result, assignmentManager, catalogTracker); fixupDaughters(result, assignmentManager, catalogTracker);
return false; 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; return true;
} }