Author: stack
Date: Fri Feb 17 21:27:48 2012
New Revision: 1245769
URL: http://svn.apache.org/viewvc?rev=1245769&view=rev
Log:
HBASE-5279 NPE in Master after upgrading to 0.92.0
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/branches/0.92/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1245769&r1=1245768&r2=1245769&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Fri Feb 17 21:27:48 2012
@@ -26,6 +26,8 @@ Release 0.92.1 - Unreleased
TestHFileOutputFormat (Gregory Chanan)
HBASE-5195 [Coprocessors] preGet hook does not allow overriding or
wrapping filter on incoming Get
+ HBASE-5279 NPE in Master after upgrading to 0.92.0
+ (Tobias Herbert)
IMPROVEMENTS
HBASE-5197 [replication] Handle socket timeouts in ReplicationSource
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java?rev=1245769&r1=1245768&r2=1245769&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java
Fri Feb 17 21:27:48 2012
@@ -118,6 +118,8 @@ public class MetaReader {
Pair<HRegionInfo, ServerName> region = parseCatalogResult(r);
if (region == null) return true;
HRegionInfo hri = region.getFirst();
+ if (hri == null) return true;
+ if (hri.getTableNameAsString() == null) return true;
if (disabledTables.contains(
hri.getTableNameAsString())) return true;
// Are we to include split parents in the list?
Modified:
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1245769&r1=1245768&r2=1245769&view=diff
==============================================================================
---
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Fri Feb 17 21:27:48 2012
@@ -2188,6 +2188,7 @@ public class AssignmentManager extends Z
if (region == null) continue;
HRegionInfo regionInfo = region.getFirst();
ServerName regionLocation = region.getSecond();
+ if (regionInfo == null) continue;
String tableName = regionInfo.getTableNameAsString();
if (regionLocation == null) {
// regionLocation could be null if createTable didn't finish properly.
