hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-8572 Enhance delete_snapshot.rb to call snapshot deletion API with regex (Ashish Singhi)
Date Thu, 20 Nov 2014 16:57:50 GMT
Repository: hbase
Updated Branches:
  refs/heads/master a98f2d30e -> e4a68606f


HBASE-8572 Enhance delete_snapshot.rb to call snapshot deletion API with regex (Ashish Singhi)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e4a68606
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e4a68606
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e4a68606

Branch: refs/heads/master
Commit: e4a68606f5b4f179a65cae261b27ef19f32f2252
Parents: a98f2d3
Author: tedyu <yuzhihong@gmail.com>
Authored: Thu Nov 20 08:57:42 2014 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Thu Nov 20 08:57:42 2014 -0800

----------------------------------------------------------------------
 .../apache/hadoop/hbase/client/HBaseAdmin.java  | 29 ++++++----
 hbase-shell/src/main/ruby/hbase/admin.rb        |  6 ++
 hbase-shell/src/main/ruby/shell.rb              |  1 +
 .../ruby/shell/commands/delete_all_snapshot.rb  | 61 ++++++++++++++++++++
 4 files changed, 87 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e4a68606/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 5fda435..e976486 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -3600,18 +3600,27 @@ public class HBaseAdmin implements Admin {
   public void deleteSnapshots(final Pattern pattern) throws IOException {
     List<SnapshotDescription> snapshots = listSnapshots(pattern);
     for (final SnapshotDescription snapshot : snapshots) {
-      // do the delete
-      executeCallable(new MasterCallable<Void>(getConnection()) {
-        @Override
-        public Void call(int callTimeout) throws ServiceException {
-          this.master.deleteSnapshot(null,
-            DeleteSnapshotRequest.newBuilder().setSnapshot(snapshot).build());
-          return null;
-        }
-      });
+      try {
+        internalDeleteSnapshot(snapshot);
+      } catch (IOException ex) {
+        LOG.info(
+          "Failed to delete snapshot " + snapshot.getName() + " for table " + snapshot.getTable(),
+          ex);
+      }
     }
   }
 
+  private void internalDeleteSnapshot(final SnapshotDescription snapshot) throws IOException
{
+    executeCallable(new MasterCallable<Void>(getConnection()) {
+      @Override
+      public Void call(int callTimeout) throws ServiceException {
+        this.master.deleteSnapshot(null, DeleteSnapshotRequest.newBuilder().setSnapshot(snapshot)
+            .build());
+        return null;
+      }
+    });
+  }
+
   /**
    * Apply the new quota settings.
    *
@@ -3757,7 +3766,7 @@ public class HBaseAdmin implements Admin {
   public CoprocessorRpcChannel coprocessorService(ServerName sn) {
     return new RegionServerCoprocessorRpcChannel(connection, sn);
   }
-  
+
   @Override
   public void updateConfiguration(ServerName server) throws IOException {
     try {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e4a68606/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index 1fe496d..d894a7d 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -783,6 +783,12 @@ module Hbase
     end
 
     #----------------------------------------------------------------------------------------------
+    # Deletes the snapshots matching the given regex
+    def delete_all_snapshot(regex)
+      @admin.deleteSnapshots(regex).to_a
+    end
+
+    #----------------------------------------------------------------------------------------------
     # Returns a list of snapshots
     def list_snapshot(regex = ".*")
       @admin.listSnapshots(regex).to_a

http://git-wip-us.apache.org/repos/asf/hbase/blob/e4a68606/hbase-shell/src/main/ruby/shell.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell.rb b/hbase-shell/src/main/ruby/shell.rb
index 620033c..082a7f0 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -361,6 +361,7 @@ Shell.load_command_group(
     restore_snapshot
     rename_snapshot
     delete_snapshot
+    delete_all_snapshot
     list_snapshots
   ]
 )

http://git-wip-us.apache.org/repos/asf/hbase/blob/e4a68606/hbase-shell/src/main/ruby/shell/commands/delete_all_snapshot.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/shell/commands/delete_all_snapshot.rb b/hbase-shell/src/main/ruby/shell/commands/delete_all_snapshot.rb
new file mode 100644
index 0000000..bc07259
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/delete_all_snapshot.rb
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+module Shell
+  module Commands
+    class DeleteAllSnapshot < Command
+      def help
+        return <<-EOF
+Delete all of the snapshots matching the given regex. Examples:
+
+  hbase> delete_all_snapshot 's.*'
+
+EOF
+      end
+
+      def command(regex)
+        formatter.header([ "SNAPSHOT", "TABLE + CREATION TIME"])
+        list = admin.list_snapshot(regex)
+        count = list.size
+        list.each do |snapshot|
+          creation_time = Time.at(snapshot.getCreationTime() / 1000).to_s
+          formatter.row([ snapshot.getName, snapshot.getTable + " (" + creation_time + ")"
])
+        end
+        puts "\nDelete the above #{count} snapshots (y/n)?" unless count == 0
+        answer = 'n'
+        answer = gets.chomp unless count == 0
+        puts "No snapshots matched the regex #{regex.to_s}" if count == 0
+        return unless answer =~ /y.*/i
+        format_simple_command do
+          admin.delete_all_snapshot(regex)
+        end
+        list = admin.list_snapshot(regex)
+        leftOverSnapshotCount = list.size
+        successfullyDeleted = count - leftOverSnapshotCount
+        puts "#{successfullyDeleted} snapshots successfully deleted." unless successfullyDeleted
== 0
+        return if leftOverSnapshotCount == 0
+        puts "\nFailed to delete the below #{leftOverSnapshotCount} snapshots."
+        formatter.header([ "SNAPSHOT", "TABLE + CREATION TIME"])
+        list.each do |snapshot|
+          creation_time = Time.at(snapshot.getCreationTime() / 1000).to_s
+          formatter.row([ snapshot.getName, snapshot.getTable + " (" + creation_time + ")"
])
+        end
+      end
+    end
+  end
+end


Mime
View raw message