Author: stack
Date: Thu Jan 20 23:12:00 2011
New Revision: 1061563
URL: http://svn.apache.org/viewvc?rev=1061563&view=rev
Log:
HBASE-3445 Master crashes on data that was moved from different host
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
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=1061563&r1=1061562&r2=1061563&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
Thu Jan 20 23:12:00 2011
@@ -22,6 +22,7 @@ package org.apache.hadoop.hbase.catalog;
import java.io.EOFException;
import java.io.IOException;
import java.net.ConnectException;
+import java.net.SocketTimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.logging.Log;
@@ -388,6 +389,9 @@ public class CatalogTracker {
} else {
throw e;
}
+ } catch (SocketTimeoutException e) {
+ // We were passed the wrong address. Return 'protocol' == null.
+ LOG.debug("Timed out connecting to " + address);
} catch (IOException ioe) {
Throwable cause = ioe.getCause();
if (cause != null && cause instanceof EOFException) {
