You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2019/03/30 01:40:14 UTC
[hbase] branch branch-2 updated: Revert "HBASE-22073 /rits.jsp
throws an exception if no procedure"
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new b1edddc Revert "HBASE-22073 /rits.jsp throws an exception if no procedure"
b1edddc is described below
commit b1edddcf89a2524f75be5021404396a5bc3434bd
Author: zhangduo <zh...@apache.org>
AuthorDate: Sat Mar 30 09:34:47 2019 +0800
Revert "HBASE-22073 /rits.jsp throws an exception if no procedure"
This reverts commit 85c17e711cdeb14bbe008a0045ca2540d51df4eb.
---
.../src/main/resources/hbase-webapps/master/rits.jsp | 18 ++++--------------
1 file changed, 4 insertions(+), 14 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 ae5f25c..78bc32e 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -22,11 +22,10 @@
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.RegionTransitionProcedure"
%>
+<%@ page import="java.util.stream.Collectors" %>
<%
HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER);
List<RegionStateNode> rit = master.getAssignmentManager().getRegionsInTransition();
@@ -87,17 +86,8 @@
<td><%= regionStateNode.getRegionInfo().getEncodedName() %></td>
<td><%= regionStateNode.getRegionInfo().getTable() %></td>
<td><%= regionStateNode.getState() %></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>
- <% } %>
+ <td><%= regionStateNode.getProcedure().getProcId() %></td>
+ <td><%= escapeXml(regionStateNode.getProcedure().getState().toString() + (regionStateNode.getProcedure().isBypass() ? "(Bypassed)" : "")) %></td>
</tr>
<% } %>
<p><%= rit.size() %> region(s) in transition.</p>
@@ -127,4 +117,4 @@
</p>
</div>
</div>
-<% } %>
+<% } %>
\ No newline at end of file