Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Previous commit purported to revert HBASE-4276, but accidentally reverted HBASE-4293. 

This commit re-applies HBASE-4293. The next commit will _actually_ revert HBASE-4276


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1163407 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Todd Lipcon 2011-08-30 21:37:13 +00:00
parent 67e634f50a
commit 9f5580eba2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -516,6 +516,8 @@ Release 0.90.5 - Unreleased
IMPROVEMENT IMPROVEMENT
HBASE-4205 Enhance HTable javadoc (Eric Charles) HBASE-4205 Enhance HTable javadoc (Eric Charles)
HBASE-4222 Make HLog more resilient to write pipeline failures 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 HBASE-4276 AssignmentManager debug logs should be at INFO level for
META/ROOT regions (todd) META/ROOT regions (todd)

6
src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
View File

@ -177,11 +177,15 @@ public class ServerShutdownHandler extends EventHandler {
// Assign root and meta if we were carrying them. // Assign root and meta if we were carrying them.
if (isCarryingRoot()) { // -ROOT- if (isCarryingRoot()) { // -ROOT-
LOG.info("Server " + serverName + " was carrying ROOT. Trying to assign.");
verifyAndAssignRootWithRetries(); verifyAndAssignRootWithRetries();
} }
// Carrying meta? // Carrying meta?
if (isCarryingMeta()) this.services.getAssignmentManager().assignMeta(); if (isCarryingMeta()) {
LOG.info("Server " + serverName + " was carrying META. Trying to assign.");
this.services.getAssignmentManager().assignMeta();
}
// Wait on meta to come online; we need it to progress. // Wait on meta to come online; we need it to progress.
// TODO: Best way to hold strictly here? We should build this retry logic // TODO: Best way to hold strictly here? We should build this retry logic