Repository: hbase Updated Branches: refs/heads/master d09200876 -> 96aca6b15
HBASE-18263 Resolve NPE in backup Master UI when accessing procedures.jsp Signed-off-by: tedyu <yuzhih...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/96aca6b1 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96aca6b1 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96aca6b1 Branch: refs/heads/master Commit: 96aca6b15392e9bdc611eee7e3273f424730cbd7 Parents: d092008 Author: å¼ ä¸å½¬10204932 <zhang.shi...@zte.com.cn> Authored: Fri Jun 23 17:17:03 2017 +0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Sat Jun 24 05:20:05 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 ++ .../src/main/resources/hbase-webapps/master/tablesDetailed.jsp | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/96aca6b1/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 14dfe0a..58ae3eb 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 @@ -125,7 +125,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <ul class="nav navbar-nav"> <li class="active"><a href="/">Home</a></li> <li><a href="/tablesDetailed.jsp">Table Details</a></li> + <%if master.isActiveMaster() %> <li><a href="/procedures.jsp">Procedures & Locks</a></li> + </%if> <li><a href="/logs/">Local Logs</a></li> <li><a href="/logLevel">Log Level</a></li> <li><a href="/dump">Debug Dump</a></li> http://git-wip-us.apache.org/repos/asf/hbase/blob/96aca6b1/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp index a485e8b..e6bca57 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp @@ -64,7 +64,9 @@ <ul class="nav navbar-nav"> <li class="active"><a href="/master-status">Home</a></li> <li><a href="/tablesDetailed.jsp">Table Details</a></li> + <%if (master.isActiveMaster()) { %> <li><a href="/procedures.jsp">Procedures & Locks</a></li> + <% } %> <li><a href="/logs/">Local Logs</a></li> <li><a href="/logLevel">Log Level</a></li> <li><a href="/dump">Debug Dump</a></li>
