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:17:16 UTC

svn commit: r1163395 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

Author: todd
Date: Tue Aug 30 21:17:16 2011
New Revision: 1163395

URL: http://svn.apache.org/viewvc?rev=1163395&view=rev
Log:
HBASE-4293  More verbose logging in ServerShutdownHandler for meta/root cases

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1163395&r1=1163394&r2=1163395&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue Aug 30 21:17:16 2011
@@ -33,7 +33,9 @@ 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)
+ 
 Release 0.90.4 - August 10, 2011
   BUG FIXES
    HBASE-3617  NoRouteToHostException during balancing will cause Master abort

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java?rev=1163395&r1=1163394&r2=1163395&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java Tue Aug 30 21:17:16 2011
@@ -160,11 +160,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