HBASE-3280 YouAreDeadException being swallowed in HRS getMaster

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1040216 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Gray 2010-11-29 18:20:11 +00:00
parent 612c28ea2e
commit a7dc9f982f
2 changed files with 8 additions and 0 deletions

View File

@ -6,6 +6,7 @@ Release 0.91.0 - Unreleased
changes at runtime (Gary Helmling via Andrew Purtell) changes at runtime (Gary Helmling via Andrew Purtell)
BUG FIXES BUG FIXES
HBASE-3280 YouAreDeadException being swallowed in HRS getMaster
IMPROVEMENTS IMPROVEMENTS
HBASE-2001 Coprocessors: Colocate user code with regions (Mingjie Lai via HBASE-2001 Coprocessors: Colocate user code with regions (Mingjie Lai via

View File

@ -686,6 +686,13 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
getMostLoadedRegions()); getMostLoadedRegions());
break; break;
} catch (IOException ioe) { } catch (IOException ioe) {
if (ioe instanceof RemoteException) {
ioe = ((RemoteException)ioe).unwrapRemoteException();
}
if (ioe instanceof YouAreDeadException) {
// This will be caught and handled as a fatal error in run()
throw ioe;
}
// Couldn't connect to the master, get location from zk and reconnect // Couldn't connect to the master, get location from zk and reconnect
// Method blocks until new master is found or we are stopped // Method blocks until new master is found or we are stopped
getMaster(); getMaster();