diff --git a/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java b/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java index 02244b1..7bf680d 100644 --- a/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java +++ b/src/main/java/org/apache/hadoop/hbase/catalog/MetaReader.java @@ -286,6 +286,9 @@ public class MetaReader { r = metaServer.get(catalogRegionName, new Get(regionName).addColumn(HConstants.CATALOG_FAMILY, HConstants.SERVER_QUALIFIER)); + } catch (java.net.SocketTimeoutException e) { + // Treat this exception + message as unavailable catalog table. Catch it + // and fall through to return a null } catch (java.net.ConnectException e) { if (e.getMessage() != null && e.getMessage().contains("Connection refused")) { diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 2cb6050..68a3273 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -1031,11 +1031,13 @@ public class AssignmentManager extends ZooKeeperListener { LOG.debug("Server " + server + " region CLOSE RPC returned false"); } catch (NotServingRegionException nsre) { // Failed to close, so pass through and reassign - LOG.info("Server " + server + " returned NotServingRegionException"); + LOG.info("Server " + server + " returned " + nsre); } catch (ConnectException e) { // Failed to connect, so pass through and reassign - LOG.info("Server " + server + " returned ConnectException " + - e.getMessage()); + LOG.info("Server " + server + " returned " + e.getMessage()); + } catch (java.net.SocketTimeoutException e) { + // Failed to connect, so pass through and reassign + LOG.info("Server " + server + " returned " + e.getMessage()); } catch (RemoteException re) { if (re.unwrapRemoteException() instanceof NotServingRegionException) { // Failed to close, so pass through and reassign