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 2019/03/27 15:53:00 UTC
[hbase] branch branch-2.1 updated: HBASE-22073 /rits.jsp throws an
exception if no procedure
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c6e0826 HBASE-22073 /rits.jsp throws an exception if no procedure
c6e0826 is described below
commit c6e08266796e97da0d2fdbcd8927f19dec945ec3
Author: Balazs Meszaros <ba...@cloudera.com>
AuthorDate: Wed Mar 20 13:12:30 2019 +0100
HBASE-22073 /rits.jsp throws an exception if no procedure
Signed-off-by: stack <st...@apache.org>
---
.../src/main/resources/hbase-webapps/master/rits.jsp | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
index e9566eb..e75e51b 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -22,10 +22,11 @@
import="java.util.Collections"
import="java.util.Comparator"
import="java.util.List"
+ import="java.util.stream.Collectors"
import="org.apache.hadoop.hbase.master.HMaster"
import="org.apache.hadoop.hbase.master.assignment.RegionStates.RegionStateNode"
+ import="org.apache.hadoop.hbase.master.assignment.RegionTransitionProcedure"
%>
-<%@ page import="java.util.stream.Collectors" %>
<%
HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER);
List<RegionStateNode> rit = master.getAssignmentManager().getRegionsInTransition();
@@ -86,8 +87,17 @@
<td><%= regionStateNode.getRegionInfo().getEncodedName() %></td>
<td><%= regionStateNode.getRegionInfo().getTable() %></td>
<td><%= regionStateNode.getState() %></td>
- <td><%= regionStateNode.getProcedure().getProcId() %></td>
- <td><%= escapeXml(regionStateNode.getProcedure().getState().toString() + (regionStateNode.getProcedure().isBypass() ? "(Bypassed)" : "")) %></td>
+ <%
+ RegionTransitionProcedure procedure = regionStateNode.getProcedure();
+
+ if (procedure == null) {
+ %>
+ <td></td>
+ <td></td>
+ <% } else { %>
+ <td><%= procedure.getProcId() %></td>
+ <td><%= escapeXml(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %></td>
+ <% } %>
</tr>
<% } %>
<p><%= rit.size() %> region(s) in transition.</p>