Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-3304 Get spurious master fails during bootup 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1041699 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-12-03 05:37:16 +00:00
parent 0d32dcab76
commit 809f5777e9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -739,6 +739,7 @@ Release 0.90.0 - Unreleased
HBASE-3301 Treat java.net.SocketTimeoutException same as ConnectException
assigning/unassigning regions
HBASE-3296 Newly created table ends up disabled instead of assigned
HBASE-3304 Get spurious master fails during bootup
IMPROVEMENTS

4
src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
View File

@ -453,6 +453,8 @@ public class CatalogTracker {
connection = waitForRootServerConnection(timeout);
} catch (NotAllMetaRegionsOnlineException e) {
// Pass
} catch (org.apache.hadoop.hbase.ipc.ServerNotRunningException e) {
// Pass -- remote server is not up so can't be carrying root
} catch (IOException e) {
// Unexpected exception
throw e;
@ -482,4 +484,4 @@ public class CatalogTracker {
public HConnection getConnection() {
return this.connection;
}
}
}

3
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
View File

@ -948,7 +948,8 @@ public class HConnectionManager {
regionServer.getInetSocketAddress(), this.conf,
this.maxRPCAttempts, this.rpcTimeout, this.rpcTimeout);
} catch (RemoteException e) {
LOG.warn("Remove exception connecting to RS", e);
LOG.warn("RemoteException connecting to RS", e);
// Throw what the RemoteException was carrying.
throw RemoteExceptionHandler.decodeRemoteException(e);
}
this.servers.put(regionServer.toString(), server);