Index: src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (revision 1155450)
+++ src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java (working copy)
@@ -49,7 +49,7 @@
/**
* Tracks the availability of the catalog tables -ROOT- and
* .META..
- *
+ *
* This class is "read-only" in that the locations of the catalog tables cannot
* be explicitly set. Instead, ZooKeeper is used to learn of the availability
* and location of -ROOT-. -ROOT- is used to learn of
@@ -103,7 +103,7 @@
* @param zk
* @param connection server connection
* @param abortable if fatal exception
- * @throws IOException
+ * @throws IOException
*/
public CatalogTracker(final ZooKeeperWatcher zk, final Configuration conf,
final Abortable abortable)
@@ -119,7 +119,7 @@
* @param abortable if fatal exception
* @param defaultTimeout Timeout to use. Pass zero for no timeout
* ({@link Object#wait(long)} when passed a 0 waits for ever).
- * @throws IOException
+ * @throws IOException
*/
public CatalogTracker(final ZooKeeperWatcher zk, final Configuration conf,
Abortable abortable, final int defaultTimeout)
@@ -146,7 +146,7 @@
* Determines current availability of catalog tables and ensures all further
* transitions of either region are tracked.
* @throws IOException
- * @throws InterruptedException
+ * @throws InterruptedException
*/
public void start() throws IOException, InterruptedException {
this.rootRegionTracker.start();
@@ -184,7 +184,7 @@
* Gets the current location for -ROOT- or null if location is
* not currently available.
* @return server name
- * @throws InterruptedException
+ * @throws InterruptedException
*/
public ServerName getRootLocation() throws InterruptedException {
return this.rootRegionTracker.getRootRegionLocation();
@@ -264,7 +264,7 @@
* if available. Returns null if no location is immediately available.
* @return connection to server hosting root, null if not available
* @throws IOException
- * @throws InterruptedException
+ * @throws InterruptedException
*/
private HRegionInterface getRootServerConnection()
throws IOException, InterruptedException {
@@ -289,7 +289,7 @@
*
* @return connection to server hosting meta, null if location not available
* @throws IOException
- * @throws InterruptedException
+ * @throws InterruptedException
*/
private HRegionInterface getMetaServerConnection(boolean refresh)
throws IOException, InterruptedException {
@@ -437,7 +437,7 @@
} else {
throw ioe;
}
-
+
}
return protocol;
}
@@ -457,20 +457,16 @@
t = e;
} catch (RemoteException e) {
IOException ioe = e.unwrapRemoteException();
- if (ioe instanceof NotServingRegionException) {
- t = ioe;
- } else {
- throw e;
- }
+ t = ioe;
} catch (IOException e) {
Throwable cause = e.getCause();
if (cause != null && cause instanceof EOFException) {
t = cause;
} else if (cause != null && cause.getMessage() != null
- && cause.getMessage().contains("Connection reset")) {
+ && cause.getMessage().contains("Connection reset")) {
t = cause;
} else {
- throw e;
+ t = e;
}
}
LOG.info("Failed verification of " + Bytes.toStringBinary(regionName) +
@@ -484,7 +480,7 @@
* the internal call to {@link #waitForRootServerConnection(long)}.
* @return True if the -ROOT- location is healthy.
* @throws IOException
- * @throws InterruptedException
+ * @throws InterruptedException
*/
public boolean verifyRootRegionLocation(final long timeout)
throws InterruptedException, IOException {