Author: stack
Date: Thu Jun 16 21:55:58 2011
New Revision: 1136698
URL: http://svn.apache.org/viewvc?rev=1136698&view=rev
Log:
HBASE-3988 Infinite loop for secondary master
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1136698&r1=1136697&r2=1136698&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Jun 16 21:55:58 2011
@@ -339,6 +339,7 @@ Release 0.90.4 - Unreleased
(Mikhail Bautin)
HBASE-3948 Improve split/compact result page for RegionServer status page
(Li Pi)
+ HBASE-3988 Infinite loop for secondary master (Liyin Tang)
IMPROVEMENT
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java?rev=1136698&r1=1136697&r2=1136698&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java
Thu Jun 16 21:55:58 2011
@@ -185,7 +185,16 @@ class ActiveMasterManager extends ZooKee
* @return True if cluster has an active master.
*/
public boolean isActiveMaster() {
- return this.clusterHasActiveMaster.get();
+ try {
+ if (ZKUtil.checkExists(watcher, watcher.masterAddressZNode) >= 0) {
+ return true;
+ }
+ }
+ catch (KeeperException ke) {
+ LOG.info("Received an unexpected KeeperException when checking " +
+ "isActiveMaster : "+ ke);
+ }
+ return false;
}
public void stop() {
