From 43f1cb5ed1fb851fe2fe689b6dec330cf9d32f58 Mon Sep 17 00:00:00 2001 From: zhangduo Date: Sat, 30 Mar 2019 09:55:32 +0800 Subject: [PATCH] HBASE-22133 Forward port HBASE-22073 "/rits.jsp throws an exception if no procedure" to branch-2.2+ --- .../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 78bc32e370..d2adf9b636 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.RegionStateNode" + import="org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure" %> -<%@ page import="java.util.stream.Collectors" %> <% HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); List rit = master.getAssignmentManager().getRegionsInTransition(); @@ -86,8 +87,17 @@ <%= regionStateNode.getRegionInfo().getEncodedName() %> <%= regionStateNode.getRegionInfo().getTable() %> <%= regionStateNode.getState() %> - <%= regionStateNode.getProcedure().getProcId() %> - <%= escapeXml(regionStateNode.getProcedure().getState().toString() + (regionStateNode.getProcedure().isBypass() ? "(Bypassed)" : "")) %> + <% + TransitRegionStateProcedure procedure = regionStateNode.getProcedure(); + + if (procedure == null) { + %> + + + <% } else { %> + <%= procedure.getProcId() %> + <%= escapeXml(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %> + <% } %> <% } %>

<%= rit.size() %> region(s) in transition.

-- 2.17.1