hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1052059 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Wed, 22 Dec 2010 20:29:41 GMT
Author: stack
Date: Wed Dec 22 20:29:40 2010
New Revision: 1052059

URL: http://svn.apache.org/viewvc?rev=1052059&view=rev
Log:
HBASE-3388 NPE processRegionInTransition(AssignmentManager.java:264) doing rolling-restart.sh

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=1052059&r1=1052058&r2=1052059&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Dec 22 20:29:40 2010
@@ -767,6 +767,8 @@ Release 0.90.0 - Unreleased
    HBASE-3381  Interrupt of a region open comes across as a successful open
    HBASE-3380  Master failover can split logs of live servers
    HBASE-3386  NPE in TableRecordReaderImpl.restart
+   HBASE-3388  NPE processRegionInTransition(AssignmentManager.java:264)
+               doing rolling-restart.sh
 
 
   IMPROVEMENTS

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=1052059&r1=1052058&r2=1052059&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
Wed Dec 22 20:29:40 2010
@@ -261,8 +261,13 @@ public class AssignmentManager extends Z
   throws KeeperException, IOException {
     RegionTransitionData data = ZKAssign.getData(watcher, encodedRegionName);
     if (data == null) return false;
-    HRegionInfo hri = (regionInfo != null)? regionInfo:
-      MetaReader.getRegion(catalogTracker, data.getRegionName()).getFirst();
+    HRegionInfo hri = regionInfo;
+    if (hri == null) {
+      Pair<HRegionInfo, HServerAddress> p =
+        MetaReader.getRegion(catalogTracker, data.getRegionName());
+      if (p == null) return false;
+      hri = p.getFirst();
+    }
     processRegionsInTransition(data, hri);
     return true;
   }



Mime
View raw message