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-15873 ACL for snapshot restore / clone is not enforced
Date Mon, 23 May 2016 02:22:54 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 9379345fa -> 0120d1dd4


HBASE-15873 ACL for snapshot restore / clone is not enforced


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

Branch: refs/heads/branch-1.1
Commit: 0120d1dd401aab4d5df6852a33a9e5e856606be5
Parents: 9379345
Author: tedyu <yuzhihong@gmail.com>
Authored: Sun May 22 19:22:45 2016 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Sun May 22 19:22:45 2016 -0700

----------------------------------------------------------------------
 .../apache/hadoop/hbase/master/snapshot/SnapshotManager.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/0120d1dd/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
index 23d9bc8..a51d4c6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
@@ -724,7 +724,7 @@ public class SnapshotManager extends MasterProcedureManager implements
Stoppable
 
       // call coproc pre hook
       if (cpHost != null) {
-        cpHost.preRestoreSnapshot(reqSnapshot, snapshotTableDesc);
+        cpHost.preRestoreSnapshot(snapshot, snapshotTableDesc);
       }
 
       int tableRegionCount = -1;
@@ -768,12 +768,12 @@ public class SnapshotManager extends MasterProcedureManager implements
Stoppable
       LOG.info("Restore snapshot=" + snapshot.getName() + " as table=" + tableName);
 
       if (cpHost != null) {
-        cpHost.postRestoreSnapshot(reqSnapshot, snapshotTableDesc);
+        cpHost.postRestoreSnapshot(snapshot, snapshotTableDesc);
       }
     } else {
       HTableDescriptor htd = RestoreSnapshotHelper.cloneTableSchema(snapshotTableDesc, tableName);
       if (cpHost != null) {
-        cpHost.preCloneSnapshot(reqSnapshot, htd);
+        cpHost.preCloneSnapshot(snapshot, htd);
       }
       try {
         checkAndUpdateNamespaceQuota(manifest, tableName);
@@ -787,7 +787,7 @@ public class SnapshotManager extends MasterProcedureManager implements
Stoppable
       LOG.info("Clone snapshot=" + snapshot.getName() + " as table=" + tableName);
 
       if (cpHost != null) {
-        cpHost.postCloneSnapshot(reqSnapshot, htd);
+        cpHost.postCloneSnapshot(snapshot, htd);
       }
     }
   }


Mime
View raw message