Revert previous commit of HBASE-4276
Realized after committing that the conditions should check isMetaTable || isRootRegion, not just isMetaTable. Will recommit a fixed version. git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1163406 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
be00c74833
commit
67e634f50a
|
@ -516,8 +516,6 @@ Release 0.90.5 - Unreleased
|
|||
IMPROVEMENT
|
||||
HBASE-4205 Enhance HTable javadoc (Eric Charles)
|
||||
HBASE-4222 Make HLog more resilient to write pipeline failures
|
||||
HBASE-4293 More verbose logging in ServerShutdownHandler for meta/root
|
||||
cases (todd)
|
||||
HBASE-4276 AssignmentManager debug logs should be at INFO level for
|
||||
META/ROOT regions (todd)
|
||||
|
||||
|
|
|
@ -177,15 +177,11 @@ public class ServerShutdownHandler extends EventHandler {
|
|||
|
||||
// Assign root and meta if we were carrying them.
|
||||
if (isCarryingRoot()) { // -ROOT-
|
||||
LOG.info("Server " + serverName + " was carrying ROOT. Trying to assign.");
|
||||
verifyAndAssignRootWithRetries();
|
||||
}
|
||||
|
||||
// Carrying meta?
|
||||
if (isCarryingMeta()) {
|
||||
LOG.info("Server " + serverName + " was carrying META. Trying to assign.");
|
||||
this.services.getAssignmentManager().assignMeta();
|
||||
}
|
||||
if (isCarryingMeta()) this.services.getAssignmentManager().assignMeta();
|
||||
|
||||
// Wait on meta to come online; we need it to progress.
|
||||
// TODO: Best way to hold strictly here? We should build this retry logic
|
||||
|
|
Loading…
Reference in New Issue