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/19 06:50:53 UTC
svn commit: r1327823 - in /hbase/branches/0.90: ./
src/main/java/org/apache/hadoop/hbase/master/
src/test/java/org/apache/hadoop/hbase/master/
Author: stack
Date: Thu Apr 19 04:50:52 2012
New Revision: 1327823
URL: http://svn.apache.org/viewvc?rev=1327823&view=rev
Log:
HBASE-5213 "hbase master stop" does not bring down backup masters
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1327823&r1=1327822&r2=1327823&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Thu Apr 19 04:50:52 2012
@@ -20,6 +20,7 @@ Release 0.90.7 - Unreleased
(Ioan Eugen Stan)
HBASE-5781 Zookeeper session got closed while trying to assign the region to RS using hbck -fix
HBASE-5793 TestHBaseFsck#TestNoHdfsTable test hangs after client retries increased
+ HBASE-5213 "hbase master stop" does not bring down backup masters (Gregory Chanan)
IMPROVEMENT
HBASE-5588 Deprecate/remove AssignmentManager#clearRegionFromTransition
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java?rev=1327823&r1=1327822&r2=1327823&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java Thu Apr 19 04:50:52 2012
@@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.zookeeper
import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.zookeeper.KeeperException;
+import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker;
/**
* Handles everything on master-side related to master election.
@@ -118,7 +119,8 @@ class ActiveMasterManager extends ZooKee
* master was running or if some other problem (zookeeper, stop flag has been
* set on this Master)
*/
- boolean blockUntilBecomingActiveMaster() {
+ boolean blockUntilBecomingActiveMaster(
+ ClusterStatusTracker clusterStatusTracker) {
boolean cleanSetOfActiveMaster = true;
// Try to become the active master, watch if there is another master
try {
@@ -158,11 +160,14 @@ class ActiveMasterManager extends ZooKee
LOG.debug("Interrupted waiting for master to die", e);
}
}
+ if (!clusterStatusTracker.isClusterUp()) {
+ this.master.stop("Cluster went down before this master became active");
+ }
if (this.master.isStopped()) {
return cleanSetOfActiveMaster;
}
// Try to become active master again now that there is no active master
- blockUntilBecomingActiveMaster();
+ blockUntilBecomingActiveMaster(clusterStatusTracker);
}
return cleanSetOfActiveMaster;
}
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1327823&r1=1327822&r2=1327823&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Thu Apr 19 04:50:52 2012
@@ -275,7 +275,15 @@ implements HMasterInterface, HMasterRegi
this.activeMasterManager = new ActiveMasterManager(zooKeeper, address, this);
this.zooKeeper.registerListener(activeMasterManager);
stallIfBackupMaster(this.conf, this.activeMasterManager);
- this.activeMasterManager.blockUntilBecomingActiveMaster();
+
+ // The ClusterStatusTracker is setup before the other
+ // ZKBasedSystemTrackers because it's needed by the activeMasterManager
+ // to check if the cluster should be shutdown.
+ this.clusterStatusTracker = new ClusterStatusTracker(getZooKeeper(), this);
+ this.clusterStatusTracker.start();
+ this.activeMasterManager.blockUntilBecomingActiveMaster(
+ this.clusterStatusTracker);
+
// We are either the active master or we were asked to shutdown
if (!this.stopped) {
finishInitialization();
@@ -371,8 +379,6 @@ implements HMasterInterface, HMasterRegi
// Set the cluster as up. If new RSs, they'll be waiting on this before
// going ahead with their startup.
- this.clusterStatusTracker = new ClusterStatusTracker(getZooKeeper(), this);
- this.clusterStatusTracker.start();
boolean wasUp = this.clusterStatusTracker.isClusterUp();
if (!wasUp) this.clusterStatusTracker.setClusterUp();
Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java?rev=1327823&r1=1327822&r2=1327823&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java Thu Apr 19 04:50:52 2012
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.catalog.C
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
+import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker;
import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -64,29 +65,32 @@ public class TestActiveMasterManager {
ZKUtil.createAndFailSilent(zk, zk.baseZNode);
try {
ZKUtil.deleteNode(zk, zk.masterAddressZNode);
+ ZKUtil.deleteNode(zk, zk.clusterStateZNode);
} catch(KeeperException.NoNodeException nne) {}
// Create the master node with a dummy address
HServerAddress master = new HServerAddress("localhost", 1);
// Should not have a master yet
- DummyMaster dummyMaster = new DummyMaster();
- ActiveMasterManager activeMasterManager = new ActiveMasterManager(zk,
- master, dummyMaster);
- zk.registerListener(activeMasterManager);
+ DummyMaster dummyMaster = new DummyMaster(zk,master);
+ ClusterStatusTracker clusterStatusTracker =
+ dummyMaster.getClusterStatusTracker();
+ ActiveMasterManager activeMasterManager =
+ dummyMaster.getActiveMasterManager();
assertFalse(activeMasterManager.clusterHasActiveMaster.get());
// First test becoming the active master uninterrupted
- activeMasterManager.blockUntilBecomingActiveMaster();
+ clusterStatusTracker.setClusterUp();
+
+ activeMasterManager.blockUntilBecomingActiveMaster(clusterStatusTracker);
assertTrue(activeMasterManager.clusterHasActiveMaster.get());
assertMaster(zk, master);
// Now pretend master restart
- DummyMaster secondDummyMaster = new DummyMaster();
- ActiveMasterManager secondActiveMasterManager = new ActiveMasterManager(zk,
- master, secondDummyMaster);
- zk.registerListener(secondActiveMasterManager);
+ DummyMaster secondDummyMaster = new DummyMaster(zk,master);
+ ActiveMasterManager secondActiveMasterManager =
+ secondDummyMaster.getActiveMasterManager();
assertFalse(secondActiveMasterManager.clusterHasActiveMaster.get());
- activeMasterManager.blockUntilBecomingActiveMaster();
+ activeMasterManager.blockUntilBecomingActiveMaster(clusterStatusTracker);
assertTrue(activeMasterManager.clusterHasActiveMaster.get());
assertMaster(zk, master);
}
@@ -103,6 +107,7 @@ public class TestActiveMasterManager {
ZKUtil.createAndFailSilent(zk, zk.baseZNode);
try {
ZKUtil.deleteNode(zk, zk.masterAddressZNode);
+ ZKUtil.deleteNode(zk, zk.clusterStateZNode);
} catch(KeeperException.NoNodeException nne) {}
// Create the master node with a dummy address
@@ -110,20 +115,21 @@ public class TestActiveMasterManager {
HServerAddress secondMasterAddress = new HServerAddress("localhost", 2);
// Should not have a master yet
- DummyMaster ms1 = new DummyMaster();
- ActiveMasterManager activeMasterManager = new ActiveMasterManager(zk,
- firstMasterAddress, ms1);
- zk.registerListener(activeMasterManager);
+ DummyMaster ms1 = new DummyMaster(zk,firstMasterAddress);
+ ActiveMasterManager activeMasterManager =
+ ms1.getActiveMasterManager();
assertFalse(activeMasterManager.clusterHasActiveMaster.get());
// First test becoming the active master uninterrupted
- activeMasterManager.blockUntilBecomingActiveMaster();
+ ClusterStatusTracker clusterStatusTracker =
+ ms1.getClusterStatusTracker();
+ clusterStatusTracker.setClusterUp();
+ activeMasterManager.blockUntilBecomingActiveMaster(clusterStatusTracker);
assertTrue(activeMasterManager.clusterHasActiveMaster.get());
assertMaster(zk, firstMasterAddress);
// New manager will now try to become the active master in another thread
WaitToBeMasterThread t = new WaitToBeMasterThread(zk, secondMasterAddress);
- zk.registerListener(t.manager);
t.start();
// Wait for this guy to figure out there is another active master
// Wait for 1 second at most
@@ -186,18 +192,20 @@ public class TestActiveMasterManager {
public static class WaitToBeMasterThread extends Thread {
ActiveMasterManager manager;
+ DummyMaster dummyMaster;
boolean isActiveMaster;
public WaitToBeMasterThread(ZooKeeperWatcher zk,
HServerAddress address) {
- this.manager = new ActiveMasterManager(zk, address,
- new DummyMaster());
+ this.dummyMaster = new DummyMaster(zk,address);
+ this.manager = this.dummyMaster.getActiveMasterManager();
isActiveMaster = false;
}
@Override
public void run() {
- manager.blockUntilBecomingActiveMaster();
+ manager.blockUntilBecomingActiveMaster(
+ this.dummyMaster.getClusterStatusTracker());
LOG.info("Second master has become the active master!");
isActiveMaster = true;
}
@@ -233,6 +241,18 @@ public class TestActiveMasterManager {
*/
public static class DummyMaster implements Server {
private volatile boolean stopped;
+ private ClusterStatusTracker clusterStatusTracker;
+ private ActiveMasterManager activeMasterManager;
+
+ public DummyMaster(ZooKeeperWatcher zk, HServerAddress master) {
+ this.clusterStatusTracker =
+ new ClusterStatusTracker(zk, this);
+ clusterStatusTracker.start();
+
+ this.activeMasterManager =
+ new ActiveMasterManager(zk, master, this);
+ zk.registerListener(activeMasterManager);
+ }
@Override
public void abort(final String msg, final Throwable t) {}
@@ -266,5 +286,13 @@ public class TestActiveMasterManager {
public CatalogTracker getCatalogTracker() {
return null;
}
+
+ public ClusterStatusTracker getClusterStatusTracker() {
+ return clusterStatusTracker;
+ }
+
+ public ActiveMasterManager getActiveMasterManager() {
+ return activeMasterManager;
+ }
}
}