backup_masters = master.getBackupMasters();
ServerName [] backupServerNames = backup_masters.toArray(new ServerName[backup_masters.size()]);
Arrays.sort(backupServerNames);
for (ServerName serverName : backupServerNames) {
- int infoPort = (masterAddressTracker == null) ? 0 : masterAddressTracker
- .getBackupMasterInfoPort(serverName);
+ int infoPort = master.getBackupMasterInfoPort(serverName);
getActiveMasterServerName() {
return Optional.ofNullable(activeMasterServerName);
}
+ public int getActiveMasterInfoPort() {
+ try {
+ return MasterAddressTracker.getMasterInfoPort(watcher);
+ } catch (Exception e) {
+ LOG.warn("Failed to get active master's info port.", e);
+ return 0;
+ }
+ }
+
+ public int getBackupMasterInfoPort(final ServerName sn) {
+ try {
+ return MasterAddressTracker.getBackupMasterInfoPort(watcher, sn);
+ } catch (Exception e) {
+ LOG.warn("Failed to get backup master: " + sn + "'s info port.", e);
+ return 0;
+ }
+ }
+
/**
* Handle a change in the master node. Doesn't matter whether this was called
* from a nodeCreated or nodeDeleted event because there are no guarantees
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index db6cb8600735..3fc4cc302e56 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2710,6 +2710,21 @@ public List getBackupMasters() {
return activeMasterManager.getBackupMasters();
}
+ /**
+ * @return info port of active master or 0 if any exception occurs.
+ */
+ public int getActiveMasterInfoPort() {
+ return activeMasterManager.getActiveMasterInfoPort();
+ }
+
+ /**
+ * @param sn is ServerName of the backup master
+ * @return info port of backup master or 0 if any exception occurs.
+ */
+ public int getBackupMasterInfoPort(final ServerName sn) {
+ return activeMasterManager.getBackupMasterInfoPort(sn);
+ }
+
@Override
public List getRegionServers() {
return serverManager.getOnlineServersList();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/http/TestMasterStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/http/TestMasterStatusServlet.java
index c2a655ee6ed0..7be0d37e236a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/http/TestMasterStatusServlet.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/http/TestMasterStatusServlet.java
@@ -23,6 +23,7 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
@@ -116,6 +117,9 @@ public void setupBasicMocks() {
Mockito.doReturn(tracker).when(master).getMasterAddressTracker();
Mockito.doReturn(FAKE_HOST).when(tracker).getMasterAddress();
+ // Fake ActiveMaster
+ Mockito.doReturn(Optional.of(FAKE_HOST)).when(master).getActiveMaster();
+
MetricsRegionServer rms = Mockito.mock(MetricsRegionServer.class);
Mockito.doReturn(new MetricsRegionServerWrapperStub()).when(rms).getRegionServerWrapper();
Mockito.doReturn(rms).when(master).getMetrics();
diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java
index 54385f81f75c..34b5cdf11009 100644
--- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java
+++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/MasterAddressTracker.java
@@ -222,6 +222,43 @@ public static int getMasterInfoPort(final ZKWatcher zkw) throws KeeperException,
}
}
+ /**
+ * Get backup master info port.
+ * Use this instead of {@link #getBackupMasterInfoPort(ServerName)} if you do not have an
+ * instance of this tracker in your context.
+ *
+ * @param zkw ZKWatcher to use
+ * @param sn ServerName of the backup master
+ * @return backup master info port in the the master address znode or 0 if no
+ * znode present.
+ * @throws KeeperException if a ZooKeeper operation fails
+ * @throws IOException if the address of the ZooKeeper master cannot be retrieved
+ */
+ public static int getBackupMasterInfoPort(ZKWatcher zkw, final ServerName sn)
+ throws KeeperException, IOException {
+ byte[] data;
+ try {
+ data = ZKUtil.getData(zkw,
+ ZNodePaths.joinZNode(zkw.getZNodePaths().backupMasterAddressesZNode, sn.toString()));
+ } catch (InterruptedException e) {
+ throw new InterruptedIOException();
+ }
+ if (data == null) {
+ throw new IOException("Can't get backup master address from ZooKeeper; znode data == null");
+ }
+ try {
+ final ZooKeeperProtos.Master backup = parse(data);
+ if (backup == null) {
+ return 0;
+ }
+ return backup.getInfoPort();
+ } catch (DeserializationException e) {
+ KeeperException ke = new KeeperException.DataInconsistencyException();
+ ke.initCause(e);
+ throw ke;
+ }
+ }
+
/**
* Set master address into the master znode or into the backup
* subdirectory of backup masters; switch off the passed in znode
|