This is an automated email from the ASF dual-hosted git repository. apurtell pushed a commit to branch branch-2.4 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 91130af844863935da2f070753e14f4df1c11ce5 Author: Andrew Purtell <[email protected]> AuthorDate: Wed Aug 4 18:22:30 2021 -0700 Revert "Add detailed RIT info in JSON format for consumption as metrics (#3555)" Commit is missing JIRA identifier. This reverts commit 9398745f449de90750797742d3a29521bf23f0c3. --- .../main/resources/hbase-webapps/master/rits.jsp | 42 ++-------------------- 1 file changed, 2 insertions(+), 40 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 3fc960e..17d0090 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp @@ -21,17 +21,11 @@ import="static org.apache.commons.lang3.StringEscapeUtils.escapeXml" import="java.util.Collections" import="java.util.Comparator" - import="java.util.ArrayList" import="java.util.List" - import="java.util.HashMap" - import="java.util.Map" import="java.util.stream.Collectors" import="org.apache.hadoop.hbase.master.HMaster" - import="org.apache.hadoop.hbase.master.RegionState" import="org.apache.hadoop.hbase.master.assignment.RegionStateNode" import="org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure" - import="org.apache.hadoop.hbase.util.GsonUtil" - import="org.apache.hbase.thirdparty.com.google.gson.Gson" %> <% HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); @@ -75,7 +69,6 @@ <div class="page-header"> <a href="/rits.jsp?format=txt&filter=region&table=<%=table%>&state=<%=state%>" class="btn btn-primary">Regions in text format</a> <a href="/rits.jsp?format=txt&filter=procedure&table=<%=table%>&state=<%=state%>" class="btn btn-info">Procedures in text format</a> - <a href="/rits.jsp?format=json&table=<%=table%>&state=<%=state%>" class="btn btn-info">RIT info as JSON</a> <p>regions and procedures in text format can be copied and passed to command-line utils such as hbck2</p> </div> </div> @@ -86,18 +79,14 @@ <th>Region</th> <th>Table</th> <th>RegionState</th> - <th>Server</th> <th>Procedure</th> <th>ProcedureState</th> - <th>Start Time</th> - <th>Duration (ms)</th> </tr> <% for (RegionStateNode regionStateNode : rit) { %> <tr> <td><%= regionStateNode.getRegionInfo().getEncodedName() %></td> <td><%= regionStateNode.getRegionInfo().getTable() %></td> <td><%= regionStateNode.getState() %></td> - <td><%= regionStateNode.getRegionLocation().getServerName() %></td> <% TransitRegionStateProcedure procedure = regionStateNode.getProcedure(); @@ -109,10 +98,6 @@ <td><%= procedure.getProcId() %></td> <td><%= escapeXml(procedure.getState().toString() + (procedure.isBypass() ? "(Bypassed)" : "")) %></td> <% } %> - - <% RegionState rs = regionStateNode.toRegionState(); %> - <td><%= rs.getStamp() %></td> - <td><%= System.currentTimeMillis() - rs.getStamp() %></td> </tr> <% } %> <p><%= rit.size() %> region(s) in transition.</p> @@ -122,30 +107,7 @@ <% } %> </div> <jsp:include page="footer.jsp" /> -<% } else if (format.equals("json")) { %> -<% - Gson GSON = GsonUtil.createGson().create(); - Map<String, List<Map<String, Object>>> map = new HashMap<>(); - List<Map<String, Object>> rits = new ArrayList<>(); - map.put("rits", rits); - for (RegionStateNode regionStateNode : rit) { - Map<String, Object> r = new HashMap<>(); - r.put("region", regionStateNode.getRegionInfo().getEncodedName()); - r.put("table", regionStateNode.getRegionInfo().getTable().getNameAsString()); - r.put("state", regionStateNode.getState()); - r.put("server", regionStateNode.getRegionLocation().getServerName()); - TransitRegionStateProcedure procedure = regionStateNode.getProcedure(); - if (procedure != null) { - r.put("procedureId", procedure.getProcId()); - r.put("procedureState", procedure.getState().toString()); - } - RegionState rs = regionStateNode.toRegionState(); - r.put("startTime", rs.getStamp()); - r.put("duration", System.currentTimeMillis() - rs.getStamp()); - rits.add(r); - } - %> - <%= GSON.toJson(map) %> + <% } else { %> <div class="container-fluid content"> <div class="row"> @@ -165,4 +127,4 @@ </p> </div> </div> -<% } %> +<% } %> \ No newline at end of file
