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 e247e75e872..6c2a3b25ef1 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 @@ -59,6 +59,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; @@ -664,6 +665,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); Snapshot Name Table Creation Time + Owner + TTL <%for SnapshotDescription snapshotDesc : snapshots%> <%java> @@ -674,6 +677,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); <% snapshotTable.getNameAsString() %> <% new Date(snapshotDesc.getCreationTime()) %> + <% snapshotDesc.getOwner() %> + + + <% snapshotDesc.getTtl() == 0 ? "FOREVER": PrettyPrinter.format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL) %> +

<% snapshots.size() %> snapshot(s) in set. [Snapshot Storefile stats]

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 d270eb87ed4..becdc68442d 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 @@ Snapshot Name Table Creation Time - TTL(Sec) + Owner + TTL Shared Storefile Size Mob Storefile Size Archived Storefile Size @@ -83,11 +85,13 @@ <%= snapshotTable.getNameAsString() %> <%= new Date(snapshotDesc.getCreationTime()) %> + <%= snapshotDesc.getOwner() %> <% if (snapshotDesc.getTtl() == 0) { %> - FOREVER + FOREVER <% } else { %> - <%= snapshotDesc.getTtl() %> + <%=PrettyPrinter + .format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL)%> <% } %> <%= StringUtils.humanReadableInt(stats.getSharedStoreFilesSize()) %>