svn commit: r1029120 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java

[jgray]

Author: jgray
Date: Sat Oct 30 17:04:06 2010
New Revision: 1029120

URL: http://svn.apache.org/viewvc?rev=1029120&view=rev
Log:
HBASE-3164 Handle case where we open META, ROOT has been closed but znode 
location not deleted yet, and try to update META location in ROOT

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/MetaEditor.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1029120&r1=1029119&r2=1029120&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sat Oct 30 17:04:06 2010
@@ -631,6 +631,9 @@ Release 0.21.0 - Unreleased
                hudson (nicolas via jgray)
    HBASE-3163  If we timeout PENDING_CLOSE and send another closeRegion RPC,
                need to handle NSRE from RS (comes as a RemoteException)
+   HBASE-3164  Handle case where we open META, ROOT has been closed but
+               znode location not deleted yet, and try to update META
+               location in ROOT
 
 
   IMPROVEMENTS

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=1029120&r1=1029119&r2=1029120&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 
Sat Oct 30 17:04:06 2010
@@ -124,7 +124,7 @@ public class MetaEditor {
       HRegionInfo regionInfo, HServerInfo serverInfo)
   throws IOException, ConnectException {
     HRegionInterface server = 
catalogTracker.waitForRootServerConnectionDefault();
-    if (server == null) throw new NullPointerException("No server for -ROOT-");
+    if (server == null) throw new IOException("No server for -ROOT-");
     updateLocation(server, CatalogTracker.ROOT_REGION, regionInfo, serverInfo);
   }