You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/03/01 16:59:40 UTC
svn commit: r1451626 - in /hbase/branches/0.95:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/
hbase-server/src/main/resources/hbase-webapps/master/
hbase-server/src/main/ruby...
Author: tedyu
Date: Fri Mar 1 15:59:39 2013
New Revision: 1451626
URL: http://svn.apache.org/r1451626
Log:
HBASE-7969 Rename HBaseAdmin#getCompletedSnapshots as HBaseAdmin#listSnapshots (Ted Yu)
Modified:
hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
hbase/branches/0.95/hbase-server/src/main/ruby/hbase/admin.rb
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java
hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
Modified: hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.95/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Fri Mar 1 15:59:39 2013
@@ -2331,7 +2331,7 @@ public class HBaseAdmin implements Abort
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 @@ public class HBaseAdmin implements Abort
* @return a list of snapshot descriptors for completed snapshots
* @throws IOException if a network error occurs
*/
- public List<SnapshotDescription> getCompletedSnapshots() throws IOException {
+ public List<SnapshotDescription> listSnapshots() throws IOException {
return execute(new MasterAdminCallable<List<SnapshotDescription>>() {
@Override
public List<SnapshotDescription> call() throws ServiceException {
Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Fri Mar 1 15:59:39 2013
@@ -319,7 +319,7 @@ org.apache.hadoop.hbase.protobuf.generat
<%def userSnapshots>
<%java>
- List<SnapshotDescription> snapshots = admin.getCompletedSnapshots();
+ List<SnapshotDescription> snapshots = admin.listSnapshots();
</%java>
<%if (snapshots != null && snapshots.size() > 0)%>
<table class="table table-striped">
Modified: hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp (original)
+++ hbase/branches/0.95/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp Fri Mar 1 15:59:39 2013
@@ -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;
Modified: hbase/branches/0.95/hbase-server/src/main/ruby/hbase/admin.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/ruby/hbase/admin.rb?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/ruby/hbase/admin.rb (original)
+++ hbase/branches/0.95/hbase-server/src/main/ruby/hbase/admin.rb Fri Mar 1 15:59:39 2013
@@ -688,7 +688,7 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Returns a list of snapshots
def list_snapshot
- @admin.getCompletedSnapshots
+ @admin.listSnapshots
end
# Apply config specific to a table/column to its descriptor
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java Fri Mar 1 15:59:39 2013
@@ -194,7 +194,7 @@ public class TestSnapshotFromClient {
admin, fs, false, new Path(rootDir, HConstants.HREGION_LOGDIR_NAME), snapshotServers);
admin.deleteSnapshot(snapshot);
- snapshots = admin.getCompletedSnapshots();
+ snapshots = admin.listSnapshots();
SnapshotTestingUtils.assertNoSnapshots(admin);
}
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/SnapshotTestingUtils.java Fri Mar 1 15:59:39 2013
@@ -67,7 +67,7 @@ public class SnapshotTestingUtils {
* 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());
}
@@ -79,7 +79,7 @@ public class SnapshotTestingUtils {
HBaseAdmin admin, String snapshotName, String tableName)
throws IOException {
// list the snapshot
- List<SnapshotDescription> snapshots = admin.getCompletedSnapshots();
+ List<SnapshotDescription> snapshots = admin.listSnapshots();
List<SnapshotDescription> returnedSnapshots = new ArrayList<SnapshotDescription>();
for (SnapshotDescription sd : snapshots) {
@@ -108,7 +108,7 @@ public class SnapshotTestingUtils {
HBaseAdmin admin, String snapshotName, String tableName)
throws IOException {
// list the snapshot
- List<SnapshotDescription> snapshots = admin.getCompletedSnapshots();
+ List<SnapshotDescription> snapshots = admin.listSnapshots();
assertEquals("Should only have 1 snapshot", 1, snapshots.size());
assertEquals(snapshotName, snapshots.get(0).getName());
Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java?rev=1451626&r1=1451625&r2=1451626&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java Fri Mar 1 15:59:39 2013
@@ -178,7 +178,7 @@ public class TestFlushSnapshotFromClient
admin, fs, false, new Path(rootDir, HConstants.HREGION_LOGDIR_NAME), snapshotServers);
admin.deleteSnapshot(snapshot);
- snapshots = admin.getCompletedSnapshots();
+ snapshots = admin.listSnapshots();
SnapshotTestingUtils.assertNoSnapshots(admin);
}
@@ -384,7 +384,7 @@ public class TestFlushSnapshotFromClient
// dump for debugging
logFSTree(new Path(UTIL.getConfiguration().get(HConstants.HBASE_DIR)));
- List<SnapshotDescription> taken = admin.getCompletedSnapshots();
+ List<SnapshotDescription> 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" +
@@ -398,4 +398,4 @@ public class TestFlushSnapshotFromClient
private void logFSTree(Path root) throws IOException {
FSUtils.logFileSystemState(UTIL.getDFSCluster().getFileSystem(), root, LOG);
}
-}
\ No newline at end of file
+}