svn commit: r1152121 - in /hbase/branches/0.90: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

[te...@apache.org]

Author: tedyu
Date: Fri Jul 29 06:39:44 2011
New Revision: 1152121

URL: http://svn.apache.org/viewvc?rev=1152121&view=rev
Log:
HBASE-4144  RS does not abort if the initialization of RS fails (ramkrishna)

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1152121&r1=1152120&r2=1152121&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Fri Jul 29 06:39:44 2011
@@ -90,6 +90,7 @@ Release 0.90.4 - Unreleased
    HBASE-4129  HBASE-3872 added a warn message 'CatalogJanitor: Daughter regiondir
                does not exist' that is triggered though its often legit that daughter
                is not present
+   HBASE-4144  RS does not abort if the initialization of RS fails (ramkrishna)
 
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the

Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1152121&r1=1152120&r2=1152121&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Jul 29 06:39:44 2011
@@ -460,7 +460,7 @@ public class HRegionServer implements HR
    * @throws IOException
    * @throws InterruptedException
    */
-  private void initialize() throws IOException, InterruptedException {
+  private void initialize() {
     try {
       initializeZooKeeper();
       initializeThreads();
@@ -471,8 +471,8 @@ public class HRegionServer implements HR
     } 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.server.stop();
+      abort("Initialization of RS failed.  Hence aborting RS.", t);
     }
   }
 
@@ -562,7 +562,7 @@ public class HRegionServer implements HR
     try {
       // Initialize threads and wait for a master
       initialize();
-    } catch (Exception e) {
+    } catch (Throwable e) {
       abort("Fatal exception during initialization", e);
     }