From 2e44b84e73de16b8450499b6c99d0bc9a4b62bd5 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 20 Jan 2011 23:12:00 +0000
Subject: [PATCH] HBASE-3445 Master crashes on data that was moved from
 different host

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1061563 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/hadoop/hbase/catalog/CatalogTracker.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java b/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
index b58cdb50356..b291936d0a0 100644
--- a/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
+++ b/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
@@ -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) {