HBASE-22133 Forward port HBASE-22073 "/rits.jsp throws an exception i…

…f no procedure" to branch-2.2+ Signed-off-by: Guanghao Zhang <zghao@apache.org>
apache · Apr 4, 2019 · 129d806 · 129d806
1 parent 49cfecb
commit 129d806
Showing 1 changed file with 13 additions and 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
@@ -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.RegionStateNode"
+         import="org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure"
 %>
-<%@ 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>
+                <%
+                    TransitRegionStateProcedure 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>