svn commit: r1294218 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java

[stack]

Author: stack
Date: Mon Feb 27 16:52:30 2012
New Revision: 1294218

URL: http://svn.apache.org/viewvc?rev=1294218&view=rev
Log:
HBASE-5481 Uncaught UnknownHostException prevents HBase from starting

Modified:
    hbase/branches/0.92/CHANGES.txt
    
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1294218&r1=1294217&r2=1294218&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Mon Feb 27 16:52:30 2012
@@ -48,6 +48,8 @@ Release 0.92.1 - Unreleased
    HBASE-5351  hbase completebulkload to a new table fails in a race
                (Gregory Chanan)
    HBASE-5473  Metrics does not push pread time (Dhruba)
+   HBASE-5481  Uncaught UnknownHostException prevents HBase from starting
+               (Benoît Sigoure)
  
  
   IMPROVEMENTS

Modified: 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1294218&r1=1294217&r2=1294218&view=diff
==============================================================================
--- 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
 (original)
+++ 
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
 Mon Feb 27 16:52:30 2012
@@ -23,6 +23,7 @@ import java.net.ConnectException;
 import java.net.NoRouteToHostException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.logging.Log;
@@ -653,6 +654,8 @@ public class CatalogTracker {
       // Pass
     } catch (ServerNotRunningYetException e) {
       // Pass -- remote server is not up so can't be carrying root
+    } catch (UnknownHostException e) {
+      // Pass -- server name doesn't resolve so it can't be assigned anything.
     }
     return (connection == null)? false:
       verifyRegionLocation(connection,
@@ -676,6 +679,8 @@ public class CatalogTracker {
       // Pass
     } catch (ServerNotRunningYetException e) {
       // Pass -- remote server is not up so can't be carrying .META.
+    } catch (UnknownHostException e) {
+      // Pass -- server name doesn't resolve so it can't be assigned anything.
     }
     return connection != null;
   }