You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2015/04/24 00:37:32 UTC
hbase git commit: HBASE-13534 Changed Master UI to promptly display
if it is a backup master. (Apekshit)
Repository: hbase
Updated Branches:
refs/heads/master bcb2a279c -> 031dd3638
HBASE-13534 Changed Master UI to promptly display if it is a backup master. (Apekshit)
Signed-off-by: Elliott Clark <ec...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/031dd363
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/031dd363
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/031dd363
Branch: refs/heads/master
Commit: 031dd3638cff1310d85ce8ba62d2278f5ef1a904
Parents: bcb2a27
Author: Apekshit(Appy) Sharma <ap...@cloudera.com>
Authored: Wed Apr 22 20:28:14 2015 -0700
Committer: Elliott Clark <ec...@apache.org>
Committed: Thu Apr 23 15:06:53 2015 -0700
----------------------------------------------------------------------
.../tmpl/master/BackupMasterStatusTmpl.jamon | 51 +++++++++-----------
.../hbase/tmpl/master/MasterStatusTmpl.jamon | 5 +-
2 files changed, 25 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/031dd363/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
index f5fa3de..9d5c2f9 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/BackupMasterStatusTmpl.jamon
@@ -27,32 +27,23 @@ org.apache.hadoop.hbase.master.HMaster;
org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
</%import>
<%java>
-Collection<ServerName> masters = null;
MasterAddressTracker masterAddressTracker = master.getMasterAddressTracker();
-if (master.isActiveMaster()) {
- ClusterStatus status = master.getClusterStatus();
- masters = status.getBackupMasters();
-} else{
- ServerName sn = masterAddressTracker == null ? null
- : masterAddressTracker.getMasterAddress();
- assert sn != null : "Failed to retreive master's ServerName!";
- masters = Collections.singletonList(sn);
-}
</%java>
-<%java>
-ServerName [] serverNames = masters.toArray(new ServerName[masters.size()]);
-int infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getMasterInfoPort();
-</%java>
<%if (!master.isActiveMaster()) %>
- <%if serverNames[0] != null %>
- <h2>Master</h2>
- <a href="//<% serverNames[0].getHostname() %>:<%
- infoPort %>/master-status" target="_blank"><%
- serverNames[0].getHostname() %></a>
- <%else>
- Unable to parse master hostname.
- </%if>
+ <%java>
+ ServerName active_master =
+ (masterAddressTracker == null) ? null : masterAddressTracker.getMasterAddress();
+ assert active_master != null : "Failed to retrieve master's ServerName!";
+ int infoPort = (masterAddressTracker == null) ? 0 : masterAddressTracker.getMasterInfoPort();
+ </%java>
+ <div class="row inner_header">
+ <div class="page-header">
+ <h1>Backup Master <small><% master.getServerName().getHostname() %></small></h1>
+ </div>
+ </div>
+ <h4>Current Active Master: <a href="//<% active_master.getHostname() %>:<% infoPort %>/master-status"
+ target="_blank"><% active_master.getHostname() %></a><h4>
<%else>
<h2>Backup Masters</h2>
@@ -63,14 +54,16 @@ int infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getMaster
<th>Start Time</th>
</tr>
<%java>
- Arrays.sort(serverNames);
- for (ServerName serverName : serverNames) {
- infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getBackupMasterInfoPort(serverName);
+ Collection<ServerName> backup_masters = master.getClusterStatus().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);
</%java>
<tr>
- <td><a href="//<% serverName.getHostname() %>:<%
- infoPort %>/master-status" target="_blank"><%
- serverName.getHostname() %></a>
+ <td><a href="//<% serverName.getHostname() %>:<% infoPort %>/master-status"
+ target="_blank"><% serverName.getHostname() %></a>
</td>
<td><% serverName.getPort() %></td>
<td><% new Date(serverName.getStartcode()) %></td>
@@ -78,6 +71,6 @@ int infoPort = masterAddressTracker == null ? 0 : masterAddressTracker.getMaster
<%java>
}
</%java>
- <tr><td>Total:<% (masters != null) ? masters.size() : 0 %></td>
+ <tr><td>Total:<% backupServerNames.length %></td>
</table>
</%if>
http://git-wip-us.apache.org/repos/asf/hbase/blob/031dd363/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
index 02bbbd5..fe9c0ad 100644
--- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
+++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -97,7 +97,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Master: <% master.getServerName().getHostname() %></title>
+ <title><%if master.isActiveMaster() %>Master: <%else>Backup Master: </%if>
+ <% master.getServerName().getHostname() %></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
@@ -137,7 +138,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<%if master.isActiveMaster() %>
<div class="row inner_header">
<div class="page-header">
- <h1>Master <small><% master.getServerName().getHostname() %> </small></h1>
+ <h1>Master <small><% master.getServerName().getHostname() %></small></h1>
</div>
</div>