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:18:13 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 c218c4eb8 -> 56c1e3522


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/56c1e352
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/56c1e352
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/56c1e352

Branch: refs/heads/branch-1.3
Commit: 56c1e352294ad89b4cd43ba987fdadaffdbcd222
Parents: c218c4e
Author: tedyu <yuzhihong@gmail.com>
Authored: Sun May 22 19:16:29 2016 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Sun May 22 19:16:29 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/56c1e352/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 419a490..e60043f 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
@@ -723,7 +723,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;
@@ -767,12 +767,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 = new HTableDescriptor(tableName, snapshotTableDesc);
       if (cpHost != null) {
-        cpHost.preCloneSnapshot(reqSnapshot, htd);
+        cpHost.preCloneSnapshot(snapshot, htd);
       }
       try {
         checkAndUpdateNamespaceQuota(manifest, tableName);
@@ -786,7 +786,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