hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1341259 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Mon, 21 May 2012 23:13:51 GMT
Author: tedyu
Date: Mon May 21 23:13:50 2012
New Revision: 1341259

URL: http://svn.apache.org/viewvc?rev=1341259&view=rev
Log:
HBASE-6041  NullPointerException prevents the master from starting up (Jimmy Xiang)

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

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1341259&r1=1341258&r2=1341259&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Mon May 21 23:13:50 2012
@@ -31,6 +31,7 @@ Release 0.90.7 - Unreleased
    HBASE-5894  Table deletion failed but HBaseAdmin#deletetable reports it as success (Xufeng)
    HBASE-5922  HalfStoreFileReader seekBefore causes StackOverflowError (Nate Putnam)
    HBASE-5757  TableInputFormat should handle as many errors as possible (Jan Lukavsky)
+   HBASE-6041  NullPointerException prevents the master from starting up (Jimmy Xiang)
 
   IMPROVEMENT
    HBASE-5588  Deprecate/remove AssignmentManager#clearRegionFromTransition

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1341259&r1=1341258&r2=1341259&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Mon May 21 23:13:50 2012
@@ -226,9 +226,13 @@ public class AssignmentManager extends Z
     // this far.  Caller takes care of it.
     HServerInfo hsi =
       this.serverManager.getHServerInfo(this.catalogTracker.getMetaLocation());
-    regionOnline(HRegionInfo.FIRST_META_REGIONINFO, hsi);
+    if (hsi != null) {
+      regionOnline(HRegionInfo.FIRST_META_REGIONINFO, hsi);
+    }
     hsi = this.serverManager.getHServerInfo(this.catalogTracker.getRootLocation());
-    regionOnline(HRegionInfo.ROOT_REGIONINFO, hsi);
+    if (hsi != null) {
+      regionOnline(HRegionInfo.ROOT_REGIONINFO, hsi);
+    }
 
     // Scan META to build list of existing regions, servers, and assignment
     // Returns servers who have not checked in (assumed dead) and their regions



Mime
View raw message