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

HBASE-3024 NPE processing server crash in MetaEditor.addDaughter 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@999672 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-09-21 22:24:05 +00:00
parent 5fa3d69f66
commit af3bf8cad0
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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

6
src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java
View File

@ -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()));
}
/**

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

@ -152,7 +152,7 @@ public class ServerShutdownHandler extends EventHandler {
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);
}