svn commit: r1041699 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

[stack]

Author: stack
Date: Fri Dec  3 05:37:16 2010
New Revision: 1041699

URL: http://svn.apache.org/viewvc?rev=1041699&view=rev
Log:
HBASE-3304 Get spurious master fails during bootup

Modified:
    hbase/trunk/CHANGES.txt
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
    
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

Modified: hbase/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1041699&r1=1041698&r2=1041699&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Fri Dec  3 05:37:16 2010
@@ -739,6 +739,7 @@ Release 0.90.0 - Unreleased
    HBASE-3301  Treat java.net.SocketTimeoutException same as ConnectException
                assigning/unassigning regions
    HBASE-3296  Newly created table ends up disabled instead of assigned
+   HBASE-3304  Get spurious master fails during bootup
 
 
   IMPROVEMENTS

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1041699&r1=1041698&r2=1041699&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java 
(original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java 
Fri Dec  3 05:37:16 2010
@@ -453,6 +453,8 @@ public class CatalogTracker {
       connection = waitForRootServerConnection(timeout);
     } catch (NotAllMetaRegionsOnlineException e) {
       // Pass
+    } catch (org.apache.hadoop.hbase.ipc.ServerNotRunningException e) {
+      // Pass -- remote server is not up so can't be carrying root
     } catch (IOException e) {
       // Unexpected exception
       throw e;
@@ -482,4 +484,4 @@ public class CatalogTracker {
   public HConnection getConnection() {
     return this.connection;
   }
-}
\ No newline at end of file
+}

Modified: 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1041699&r1=1041698&r2=1041699&view=diff
==============================================================================
--- 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 (original)
+++ 
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
 Fri Dec  3 05:37:16 2010
@@ -948,7 +948,8 @@ public class HConnectionManager {
                 regionServer.getInetSocketAddress(), this.conf,
                 this.maxRPCAttempts, this.rpcTimeout, this.rpcTimeout);
           } catch (RemoteException e) {
-            LOG.warn("Remove exception connecting to RS", e);
+            LOG.warn("RemoteException connecting to RS", e);
+            // Throw what the RemoteException was carrying.
             throw RemoteExceptionHandler.decodeRemoteException(e);
           }
           this.servers.put(regionServer.toString(), server);