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 65bb0f21f13..000a0338214 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 @@ -270,7 +270,6 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
- <& userSnapshots &>
@@ -660,40 +659,6 @@ AssignmentManager assignmentManager = master.getAssignmentManager(); -<%def userSnapshots> -<%java> - List snapshots = master.isInitialized() ? - master.getSnapshotManager().getCompletedSnapshots() : null; - -<%if (snapshots != null && snapshots.size() > 0)%> - - - - - - - - - <%for SnapshotDescription snapshotDesc : snapshots%> - <%java> - TableName snapshotTable = TableName.valueOf(snapshotDesc.getTable()); - - - - - - - - - - -

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

-
Snapshot NameTableCreation TimeOwnerTTL
<% snapshotDesc.getName() %> <% snapshotTable.getNameAsString() %> - <% new Date(snapshotDesc.getCreationTime()) %><% snapshotDesc.getOwner() %> - <% snapshotDesc.getTtl() == 0 ? "FOREVER": PrettyPrinter.format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL) %> -
- - <%def deadRegionServers> diff --git a/hbase-server/src/main/resources/hbase-webapps/master/userSnapshots.jsp b/hbase-server/src/main/resources/hbase-webapps/master/userSnapshots.jsp new file mode 100644 index 00000000000..0b741e1089f --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/userSnapshots.jsp @@ -0,0 +1,58 @@ +<%-- +/** + * 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/plain;charset=UTF-8" + import="java.util.List" + import="java.util.Date" + import="org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription" + import="org.apache.hadoop.hbase.master.HMaster" + import="org.apache.hadoop.hbase.TableName" + import="org.apache.hadoop.hbase.util.PrettyPrinter" +%> +<% + HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); + List snapshots = master.isInitialized() ? + master.getSnapshotManager().getCompletedSnapshots() : null; +%> +<%if (snapshots != null && snapshots.size() > 0) { %> + + + + + + + + + <% for (SnapshotDescription snapshotDesc : snapshots){ %> + <% TableName snapshotTable = TableName.valueOf(snapshotDesc.getTable()); %> + + + + + + + + + <% } %> +

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

+
Snapshot NameTableCreation TimeOwnerTTL
<%= snapshotDesc.getName() %> <%= snapshotTable.getNameAsString() %> + <%= new Date(snapshotDesc.getCreationTime()) %><%= snapshotDesc.getOwner() %> + <%= snapshotDesc.getTtl() == 0 ? "FOREVER": PrettyPrinter.format(String.valueOf(snapshotDesc.getTtl()), PrettyPrinter.Unit.TIME_INTERVAL) %> +
+<% } %> diff --git a/hbase-server/src/main/resources/hbase-webapps/static/js/tab.js b/hbase-server/src/main/resources/hbase-webapps/static/js/tab.js index 31438a1b36f..808882b9f40 100644 --- a/hbase-server/src/main/resources/hbase-webapps/static/js/tab.js +++ b/hbase-server/src/main/resources/hbase-webapps/static/js/tab.js @@ -26,6 +26,10 @@ $(document).ready( location.hash = $(e.target).attr('href').substr(1).replace(prefix, ""); $(this).tab('show'); }); + + $.ajax({url:"/userSnapshots.jsp", success:function(result){ + $("#tab_userSnapshots").html(result); + }}); if (location.hash !== '') { var tabItem = $('a[href="' + location.hash.replace("#", "#"+prefix) + '"]'); @@ -35,4 +39,4 @@ $(document).ready( } return true; } -); \ No newline at end of file +);