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 03:52:17 UTC
svn commit: r1329528 - in /hbase/branches/0.94/src:
main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
Author: stack
Date: Tue Apr 24 01:52:16 2012
New Revision: 1329528
URL: http://svn.apache.org/viewvc?rev=1329528&view=rev
Log:
HBASE-5849 On first cluster startup, RS aborts if root znode is not available
Added:
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1329528&r1=1329527&r2=1329528&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Apr 24 01:52:16 2012
@@ -605,12 +605,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.");
Added: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java?rev=1329528&view=auto
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java (added)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java Tue Apr 24 01:52:16 2012
@@ -0,0 +1,118 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase;
+
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
+import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Tests the boot order indifference between regionserver and master
+ */
+@Category(MediumTests.class)
+public class TestClusterBootOrder {
+
+ private static final long SLEEP_INTERVAL = 1000;
+ private static final long SLEEP_TIME = 4000;
+
+ private HBaseTestingUtility testUtil;
+ private LocalHBaseCluster cluster;
+ private RegionServerThread rs;
+ private MasterThread master;
+
+ @Before
+ public void setUp() throws Exception {
+ testUtil = new HBaseTestingUtility();
+ testUtil.startMiniZKCluster(1);
+ cluster = new LocalHBaseCluster(testUtil.getConfiguration(), 0, 0);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ cluster.shutdown();
+ cluster.join();
+ testUtil.shutdownMiniZKCluster();
+ }
+
+ private void startRegionServer() throws Exception {
+ rs = cluster.addRegionServer();
+ rs.start();
+
+ for (int i=0; i * SLEEP_INTERVAL < SLEEP_TIME ;i++) {
+ //we cannot block on wait for rs at this point , since master is not up.
+ Thread.sleep(SLEEP_INTERVAL);
+ assertTrue(rs.isAlive());
+ }
+ }
+
+ private void startMaster() throws Exception {
+ master = cluster.addMaster();
+ master.start();
+
+ for (int i=0; i * SLEEP_INTERVAL < SLEEP_TIME ;i++) {
+ Thread.sleep(SLEEP_INTERVAL);
+ assertTrue(master.isAlive());
+ }
+ }
+
+ private void waitForClusterOnline() {
+ while (true) {
+ if (master.getMaster().isInitialized()) {
+ break;
+ }
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ignored) {
+ // Keep waiting
+ }
+ }
+ rs.waitForServerOnline();
+ }
+
+ /**
+ * Tests launching the cluster by first starting regionserver, and then the master
+ * to ensure that it does not matter which is started first.
+ */
+ @Test(timeout = 12000)
+ public void testBootRegionServerFirst() throws Exception {
+ startRegionServer();
+ startMaster();
+ waitForClusterOnline();
+ }
+
+ /**
+ * Tests launching the cluster by first starting master, and then the regionserver
+ * to ensure that it does not matter which is started first.
+ */
+ @Test(timeout = 12000)
+ public void testBootMasterFirst() throws Exception {
+ startMaster();
+ startRegionServer();
+ waitForClusterOnline();
+ }
+
+ @org.junit.Rule
+ public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+ new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
+}