diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon index b94ba4338e0..9c6916e768d 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon @@ -50,7 +50,7 @@ int numOfPages = (int) Math.ceil(numOfRITs * 1.0 / ritsPerPage);

Regions in Transition

-

<% numOfRITs %> region(s) in transition. +

<% numOfRITs %> region(s) in transition. <%if ritStat.hasRegionsTwiceOverThreshold() %> <%elseif ritStat.hasRegionsOverThreshold() %> diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index f3ce3c80d83..03056e14809 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -215,6 +215,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); or re-run HBCK in repair mode. + <%if master.getAssignmentManager() != null %> + <& AssignmentManagerStatusTmpl; assignmentManager=master.getAssignmentManager()&> + <%if master.getMasterCoprocessorHost().findCoprocessor("RSGroupAdminEndpoint") != null %>

RSGroup

@@ -267,9 +270,6 @@ AssignmentManager assignmentManager = master.getAssignmentManager();

Peers

<& peerConfigs &>
- <%if master.getAssignmentManager() != null %> - <& AssignmentManagerStatusTmpl; assignmentManager=master.getAssignmentManager()&> - <%else>
<& BackupMasterStatusTmpl; master = master &> @@ -534,9 +534,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <% tableState.getState() %> <% openRegionsCount %> - <% openingRegionsCount %> + <%if (openingRegionsCount > 0) %> <% openingRegionsCount %> <%else><% openingRegionsCount %> <% closedRegionsCount %> - <% closingRegionsCount %> + <%if (closingRegionsCount > 0) %> <% closingRegionsCount %> <%else><% closingRegionsCount %> <% offlineRegionsCount %> <% failedRegionsCount %> <% splitRegionsCount %> diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp new file mode 100644 index 00000000000..78bc32e370a --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp @@ -0,0 +1,120 @@ +<%-- +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--%> +<%@ page contentType="text/html;charset=UTF-8" + import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml" + import="java.util.Collections" + import="java.util.Comparator" + import="java.util.List" + import="org.apache.hadoop.hbase.master.HMaster" + import="org.apache.hadoop.hbase.master.assignment.RegionStateNode" +%> +<%@ page import="java.util.stream.Collectors" %> +<% + HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); + List rit = master.getAssignmentManager().getRegionsInTransition(); + String table = request.getParameter("table"); + String state = request.getParameter("state"); + if (table != null && state != null && !table.equals("null") && !state.equals("null")) { + rit = rit.stream().filter(regionStateNode -> regionStateNode.getTable().getNameAsString().equals(table)) + .filter(regionStateNode -> regionStateNode.getState().name().equals(state)) + .collect(Collectors.toList()); + } + + String format = request.getParameter("format"); + if(format == null || format.isEmpty()){ + format = "html"; + } + String filter = request.getParameter("filter"); + Collections.sort(rit, new Comparator() { + @Override + public int compare(RegionStateNode o1, RegionStateNode o2) { + if (o1.getState() != o2.getState()){ + return o1.getState().ordinal() - o2.getState().ordinal(); + } + return o1.compareTo(o2); + } + }); +%> + + +<% if (format.equals("html")) { %> + + + +
+
+
+

Regions in transition

+
+
+
+
+ Regions in text format + Procedures in text format +

regions and procedures in text format can be copied and passed to command-line utils such as hbck2

+
+
+ + <% if (rit != null && rit.size() > 0) { %> + + + + + + + + + <% for (RegionStateNode regionStateNode : rit) { %> + + + + + + + + <% } %> +

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

+
RegionTableRegionStateProcedureProcedureState
<%= regionStateNode.getRegionInfo().getEncodedName() %><%= regionStateNode.getRegionInfo().getTable() %><%= regionStateNode.getState() %><%= regionStateNode.getProcedure().getProcId() %><%= escapeXml(regionStateNode.getProcedure().getState().toString() + (regionStateNode.getProcedure().isBypass() ? "(Bypassed)" : "")) %>
+ <% } else { %> +

no region in transition right now.

+ <% } %> +
+ + +<% } else { %> +
+
+

+ <% + if (filter.equals("region")) { + for (RegionStateNode regionStateNode : rit) { %> + <%= regionStateNode.getRegionInfo().getEncodedName() %>
+ <% } + } else if (filter.equals("procedure")) { + for (RegionStateNode regionStateNode : rit) { %> + <%= regionStateNode.getProcedure().getProcId() %>
+ <% } + } else { %> + "Not a valid filter" + <% } %> +

+
+
+<% } %> \ No newline at end of file