hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1330118 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Date Wed, 25 Apr 2012 05:48:25 GMT
Author: stack
Date: Wed Apr 25 05:48:24 2012
New Revision: 1330118

URL: http://svn.apache.org/viewvc?rev=1330118&view=rev
Log:
HBASE-5849 On first cluster startup, RS aborts if root znode is not available; REAPPLY

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

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1330118&r1=1330117&r2=1330118&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Wed Apr 25 05:48:24 2012
@@ -49,6 +49,8 @@ Release 0.92.2 - Unreleased
    HBASE-5850  Refuse operations from Admin before master is initialized - fix for all branches
(xufeng)
    HBASE-5863  Improve the graceful_stop.sh CLI help (especially about reloads)
                (Harsh J)
+   HBASE-5849  On first cluster startup, RS aborts if root znode is not available
+               (Enis Soztutar)
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1330118&r1=1330117&r2=1330118&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
(original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Wed Apr 25 05:48:24 2012
@@ -585,12 +585,6 @@ public class HRegionServer implements HR
    */
   private void blockAndCheckIfStopped(ZooKeeperNodeTracker tracker)
       throws IOException, InterruptedException {
-    if (false == tracker.checkIfBaseNodeAvailable()) {
-      String errorMsg = "Check the value configured in 'zookeeper.znode.parent'. "
-          + "There could be a mismatch with the one configured in the master.";
-      LOG.error(errorMsg);
-      abort(errorMsg);
-    }
     while (tracker.blockUntilAvailable(this.msgInterval, false) == null) {
       if (this.stopped) {
         throw new IOException("Received the shutdown message while waiting.");



Mime
View raw message