You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by to...@apache.org on 2011/08/30 23:37:14 UTC
svn commit: r1163407 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Author: todd
Date: Tue Aug 30 21:37:13 2011
New Revision: 1163407
URL: http://svn.apache.org/viewvc?rev=1163407&view=rev
Log:
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
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1163407&r1=1163406&r2=1163407&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Aug 30 21:37:13 2011
@@ -516,6 +516,8 @@ 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)
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1163407&r1=1163406&r2=1163407&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Tue Aug 30 21:37:13 2011
@@ -177,11 +177,15 @@ public class ServerShutdownHandler exten
// 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()) 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.
// TODO: Best way to hold strictly here? We should build this retry logic