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 2018/11/02 18:45:57 UTC
hbase git commit: HBASE-21407 Resolve NPE in backup Master UI
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 ec9c25561 -> a20f599ac
HBASE-21407 Resolve NPE in backup Master UI
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a20f599a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a20f599a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a20f599a
Branch: refs/heads/branch-2.0
Commit: a20f599acccefa7ac026a701826a9fd9cb5622f7
Parents: ec9c255
Author: jingyuntian <ti...@gmail.com>
Authored: Tue Oct 30 16:35:39 2018 +0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Nov 2 11:45:46 2018 -0700
----------------------------------------------------------------------
.../src/main/resources/hbase-webapps/master/header.jsp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a20f599a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
index d187eb5..0df7099 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/header.jsp
@@ -18,7 +18,11 @@
*/
--%>
<%@ page contentType="text/html;charset=UTF-8"
- import="org.apache.hadoop.hbase.HBaseConfiguration"
+ import="org.apache.hadoop.hbase.master.HMaster"
+ import="org.apache.hadoop.hbase.HBaseConfiguration"
+%>
+<%
+ HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER);
%>
<!DOCTYPE html>
<?xml version="1.0" encoding="UTF-8" ?>
@@ -52,7 +56,9 @@
<ul class="nav navbar-nav">
<li><a href="/master-status">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li>
- <li><a href="/procedures.jsp">Procedures</a></li>
+ <% if (master.isActiveMaster()){ %>
+ <li><a href="/procedures.jsp">Procedures & Locks</a></li>
+ <% }%>
<li><a href="/processMaster.jsp">Process Metrics</a></li>
<li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li>