Index: hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java (revision 1451472) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java (working copy) @@ -179,7 +179,7 @@ admin, fs, false, new Path(rootDir, HConstants.HREGION_LOGDIR_NAME), snapshotServers); admin.deleteSnapshot(snapshot); - snapshots = admin.getCompletedSnapshots(); + snapshots = admin.listSnapshots(); SnapshotTestingUtils.assertNoSnapshots(admin); } @@ -385,7 +385,7 @@ // dump for debugging logFSTree(new Path(UTIL.getConfiguration().get(HConstants.HBASE_DIR))); - List taken = admin.getCompletedSnapshots(); + List taken = admin.listSnapshots(); int takenSize = taken.size(); LOG.info("Taken " + takenSize + " snapshots: " + taken); assertTrue("We expect at least 1 request to be rejected because of we concurrently" + Index: hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java (revision 1451472) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java (working copy) @@ -68,7 +68,7 @@ * if the admin operation fails */ public static void assertNoSnapshots(HBaseAdmin admin) throws IOException { - assertEquals("Have some previous snapshots", 0, admin.getCompletedSnapshots() + assertEquals("Have some previous snapshots", 0, admin.listSnapshots() .size()); } @@ -80,7 +80,7 @@ HBaseAdmin admin, String snapshotName, String tableName) throws IOException { // list the snapshot - List snapshots = admin.getCompletedSnapshots(); + List snapshots = admin.listSnapshots(); List returnedSnapshots = new ArrayList(); for (SnapshotDescription sd : snapshots) { @@ -109,7 +109,7 @@ HBaseAdmin admin, String snapshotName, String tableName) throws IOException { // list the snapshot - List snapshots = admin.getCompletedSnapshots(); + List snapshots = admin.listSnapshots(); assertEquals("Should only have 1 snapshot", 1, snapshots.size()); assertEquals(snapshotName, snapshots.get(0).getName()); Index: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (revision 1451472) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (working copy) @@ -194,7 +194,7 @@ admin, fs, false, new Path(rootDir, HConstants.HREGION_LOGDIR_NAME), snapshotServers); admin.deleteSnapshot(snapshot); - snapshots = admin.getCompletedSnapshots(); + snapshots = admin.listSnapshots(); SnapshotTestingUtils.assertNoSnapshots(admin); } Index: hbase-server/src/main/ruby/hbase/admin.rb =================================================================== --- hbase-server/src/main/ruby/hbase/admin.rb (revision 1451472) +++ hbase-server/src/main/ruby/hbase/admin.rb (working copy) @@ -688,7 +688,7 @@ #---------------------------------------------------------------------------------------------- # Returns a list of snapshots def list_snapshot - @admin.getCompletedSnapshots + @admin.listSnapshots end # Apply config specific to a table/column to its descriptor Index: hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon =================================================================== --- hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (revision 1451472) +++ hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (working copy) @@ -319,7 +319,7 @@ <%def userSnapshots> <%java> - List snapshots = admin.getCompletedSnapshots(); + List snapshots = admin.listSnapshots(); <%if (snapshots != null && snapshots.size() > 0)%> Index: hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp =================================================================== --- hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp (revision 1451472) +++ hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp (working copy) @@ -41,7 +41,7 @@ boolean readOnly = conf.getBoolean("hbase.master.ui.readonly", false); String snapshotName = request.getParameter("name"); SnapshotDescription snapshot = null; - for (SnapshotDescription snapshotDesc: hbadmin.getCompletedSnapshots()) { + for (SnapshotDescription snapshotDesc: hbadmin.listSnapshots()) { if (snapshotName.equals(snapshotDesc.getName())) { snapshot = snapshotDesc; break; Index: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java =================================================================== --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1451472) +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy) @@ -2331,7 +2331,7 @@ String rollbackSnapshot = snapshotName + "-" + EnvironmentEdgeManager.currentTimeMillis(); String tableName = null; - for (SnapshotDescription snapshotInfo: getCompletedSnapshots()) { + for (SnapshotDescription snapshotInfo: listSnapshots()) { if (snapshotInfo.getName().equals(snapshotName)) { tableName = snapshotInfo.getTable(); break; @@ -2477,7 +2477,7 @@ * @return a list of snapshot descriptors for completed snapshots * @throws IOException if a network error occurs */ - public List getCompletedSnapshots() throws IOException { + public List listSnapshots() throws IOException { return execute(new MasterAdminCallable>() { @Override public List call() throws ServiceException {