You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/04/24 07:57:34 UTC
svn commit: r1329562 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
Author: stack
Date: Tue Apr 24 05:57:34 2012
New Revision: 1329562
URL: http://svn.apache.org/viewvc?rev=1329562&view=rev
Log:
HBASE-5849 On first cluster startup, RS aborts if root znode is not available; REVERT
Removed:
hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
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=1329562&r1=1329561&r2=1329562&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Tue Apr 24 05:57:34 2012
@@ -46,8 +46,6 @@ Release 0.92.2 - Unreleased
HBASE-5821 Incorrect handling of null value in Coprocessor aggregation function min() (Maryann Xue)
HBASE-5833 0.92 build has been failing pretty consistently on TestMasterFailover
HBASE-5857 RIT map in RS not getting cleared while region opening (Chinna Rao)
- HBASE-5849 On first cluster startup, RS aborts if root znode is not available
- (Enis Soztutar)
HBASE-5850 Refuse operations from Admin before master is initialized - fix for all branches (xufeng)
IMPROVEMENTS
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=1329562&r1=1329561&r2=1329562&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 Tue Apr 24 05:57:34 2012
@@ -585,6 +585,12 @@ 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.");