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

HBASE-4144 RS does not abort if the initialization of RS fails (ramkrishna.s.vasudevan) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1152122 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-07-29 06:42:11 +00:00
parent e5bbebc507
commit 996268c26e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -177,6 +177,7 @@ Release 0.91.0 - Unreleased
(Prakash Khemani and ramkrishna.s.vasudevan)
HBASE-4083 If Enable table is not completed and is partial, then scanning of
the table is not working (ramkrishna.s.vasudevan)
HBASE-4144 RS does not abort if the initialization of RS fails (ramkrishna.s.vasudevan)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)

7
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -498,8 +498,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
* @throws IOException
* @throws InterruptedException
*/
private void preRegistrationInitialization()
throws IOException, InterruptedException {
private void preRegistrationInitialization(){
try {
initializeZooKeeper();
initializeThreads();
@ -510,8 +509,8 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
} catch (Throwable t) {
// Call stop if error or process will stick around for ever since server
// puts up non-daemon threads.
LOG.error("Stopping HRS because failed initialize", t);
this.rpcServer.stop();
abort("Initialization of RS failed. Hence aborting RS.", t);
}
}
@ -597,7 +596,7 @@ public class HRegionServer implements HRegionInterface, HBaseRPCErrorHandler,
try {
// Do pre-registration initializations; zookeeper, lease threads, etc.
preRegistrationInitialization();
} catch (Exception e) {
} catch (Throwable e) {
abort("Fatal exception during initialization", e);
}