diff --git a/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java b/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java index 7a19c0e..695fdf2 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/ActiveMasterManager.java @@ -185,7 +185,16 @@ class ActiveMasterManager extends ZooKeeperListener { * @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() {