Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18263 Resolve NPE in backup Master UI when accessing procedures.jsp 

Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
张世彬10204932 2017-06-23 17:17:03 +08:00 committed by tedyu
parent d092008766
commit 96aca6b153
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -125,7 +125,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="/">Home</a></li> <li class="active"><a href="/">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li> <li><a href="/tablesDetailed.jsp">Table Details</a></li>
<%if master.isActiveMaster() %>
<li><a href="/procedures.jsp">Procedures &amp; Locks</a></li> <li><a href="/procedures.jsp">Procedures &amp; Locks</a></li>
</%if>
<li><a href="/logs/">Local Logs</a></li> <li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>

2
hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
View File

@ -64,7 +64,9 @@
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="active"><a href="/master-status">Home</a></li> <li class="active"><a href="/master-status">Home</a></li>
<li><a href="/tablesDetailed.jsp">Table Details</a></li> <li><a href="/tablesDetailed.jsp">Table Details</a></li>
<%if (master.isActiveMaster()) { %>
<li><a href="/procedures.jsp">Procedures &amp; Locks</a></li> <li><a href="/procedures.jsp">Procedures &amp; Locks</a></li>
<% } %>
<li><a href="/logs/">Local Logs</a></li> <li><a href="/logs/">Local Logs</a></li>
<li><a href="/logLevel">Log Level</a></li> <li><a href="/logLevel">Log Level</a></li>
<li><a href="/dump">Debug Dump</a></li> <li><a href="/dump">Debug Dump</a></li>