You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2020/07/10 07:03:19 UTC
[hbase] branch master updated: HBASE-24653 Show snapshot owner on
Master WebUI (#2016)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 5de1dff HBASE-24653 Show snapshot owner on Master WebUI (#2016)
5de1dff is described below
commit 5de1dff8f6cd539893be70269b6677137b25791f
Author: niuyulin <ny...@163.com>
AuthorDate: Fri Jul 10 15:03:05 2020 +0800
HBASE-24653 Show snapshot owner on Master WebUI (#2016)
Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
.../org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 8 ++++++++
.../src/main/resources/hbase-webapps/master/snapshotsStats.jsp | 10 +++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
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 4a6414a..31c6ebf 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
@@ -60,6 +60,7 @@ org.apache.hadoop.hbase.tool.CanaryTool;
org.apache.hadoop.hbase.util.Bytes;
org.apache.hadoop.hbase.util.CommonFSUtils;
org.apache.hadoop.hbase.util.JvmVersion;
+org.apache.hadoop.hbase.util.PrettyPrinter;
org.apache.hadoop.util.StringUtils;
</%import>
@@ -663,6 +664,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<th>Snapshot Name</th>
<th>Table</th>
<th>Creation Time</th>
+ <th>Owner</th>
+ <th>TTL</th>
</tr>
<%for SnapshotDescription snapshotDesc : snapshots%>
<%java>
@@ -673,6 +676,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
<td><a href="table.jsp?name=<% snapshotTable.getNameAsString() %>"><% snapshotTable.getNameAsString() %></a>
</td>
<td><% new Date(snapshotDesc.getCreationTime()) %></td>
+ <td><% snapshotDesc.getOwner() %></td>
+
+ <td>
+ <% snapshotDesc.getTtl() == 0 ? "FOREVER": PrettyPrinter.format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL) %>
+ </td>
</tr>
</%for>
<p><% snapshots.size() %> snapshot(s) in set. [<a href="/snapshotsStats.jsp">Snapshot Storefile stats</a>]</p>
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp
index d270eb8..becdc68 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshotsStats.jsp
@@ -30,6 +30,7 @@
import="org.apache.hadoop.util.StringUtils"
import="org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription"
%>
+<%@ page import="org.apache.hadoop.hbase.util.PrettyPrinter" %>
<%
HMaster master = (HMaster)getServletContext().getAttribute(HMaster.MASTER);
Configuration conf = master.getConfiguration();
@@ -65,7 +66,8 @@
<th>Snapshot Name</th>
<th>Table</th>
<th>Creation Time</th>
- <th>TTL(Sec)</th>
+ <th>Owner</th>
+ <th>TTL</th>
<th>Shared Storefile Size</th>
<th>Mob Storefile Size</th>
<th>Archived Storefile Size</th>
@@ -83,11 +85,13 @@
<td><a href="/table.jsp?name=<%= snapshotTable.getNameAsString() %>">
<%= snapshotTable.getNameAsString() %></a></td>
<td><%= new Date(snapshotDesc.getCreationTime()) %></td>
+ <td><%= snapshotDesc.getOwner() %></td>
<td>
<% if (snapshotDesc.getTtl() == 0) { %>
- FOREVER
+ FOREVER
<% } else { %>
- <%= snapshotDesc.getTtl() %>
+ <%=PrettyPrinter
+ .format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL)%>
<% } %>
</td>
<td><%= StringUtils.humanReadableInt(stats.getSharedStoreFilesSize()) %></td>