svn commit: r999672 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java

[stack]

Author: stack
Date: Tue Sep 21 22:24:05 2010
New Revision: 999672

URL: http://svn.apache.org/viewvc?rev=999672&view=rev
Log:
HBASE-3024 NPE processing server crash in MetaEditor.addDaughter

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
    
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=999672&r1=999671&r2=999672&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Sep 21 22:24:05 2010
@@ -533,6 +533,7 @@ Release 0.21.0 - Unreleased
    HBASE-3018  Bulk assignment on startup runs serially through the cluster
                servers assigning in bulk to one at a time
    HBASE-3023  NPE processing server crash in MetaReader. getServerUserRegions
+   HBASE-3024  NPE processing server crash in MetaEditor.addDaughter
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java?rev=999672&r1=999671&r2=999672&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java 
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java 
Tue Sep 21 22:24:05 2010
@@ -100,9 +100,9 @@ public class MetaEditor {
     if (serverInfo != null) addLocation(put, serverInfo);
     server.put(catalogRegionName, put);
     LOG.info("Added daughter " + regionInfo.getRegionNameAsString() +
-      " in region " + Bytes.toString(catalogRegionName) + " with " +
-      "server=" + serverInfo.getHostnamePort() + ", " +
-      "startcode=" + serverInfo.getStartCode());
+      " in region " + Bytes.toString(catalogRegionName) +
+      (serverInfo == null?
+        ", serverInfo=null": ", serverInfo=" + serverInfo.getServerName()));
   }
 
   /**

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=999672&r1=999671&r2=999672&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 Sep 21 22:24:05 2010
@@ -152,7 +152,7 @@ public class ServerShutdownHandler exten
     if (bytes == null || bytes.length <= 0) return;
     HRegionInfo hri = Writables.getHRegionInfo(bytes);
     if (!hris.containsKey(hri)) {
-      LOG.info("Fixup; missing daughter " + hri.getEncodedNameAsBytes());
+      LOG.info("Fixup; missing daughter " + hri.getEncodedName());
       MetaEditor.addDaughter(this.server.getCatalogTracker(), hri, null);
       this.services.getAssignmentManager().assign(hri);
     }