Repository: hbase Updated Branches: refs/heads/0.98 45bf0c64f -> 60dbf6769
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/7be7b8ad Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7be7b8ad Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7be7b8ad Branch: refs/heads/0.98 Commit: 7be7b8ad9622a2297dcd00a5f580d748e08f33e0 Parents: 45bf0c6 Author: tedyu <yuzhih...@gmail.com> Authored: Sun May 22 19:13:13 2016 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Tue May 31 11:59:40 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/7be7b8ad/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 621ea8a..ead27d2 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 @@ -704,24 +704,24 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable // call coproc pre hook if (cpHost != null) { - cpHost.preRestoreSnapshot(reqSnapshot, snapshotTableDesc); + cpHost.preRestoreSnapshot(fsSnapshot, snapshotTableDesc); } restoreSnapshot(fsSnapshot, snapshotTableDesc); LOG.info("Restore snapshot=" + fsSnapshot.getName() + " as table=" + tableName); if (cpHost != null) { - cpHost.postRestoreSnapshot(reqSnapshot, snapshotTableDesc); + cpHost.postRestoreSnapshot(fsSnapshot, snapshotTableDesc); } } else { HTableDescriptor htd = RestoreSnapshotHelper.cloneTableSchema(snapshotTableDesc, tableName); if (cpHost != null) { - cpHost.preCloneSnapshot(reqSnapshot, htd); + cpHost.preCloneSnapshot(fsSnapshot, htd); } cloneSnapshot(fsSnapshot, htd); LOG.info("Clone snapshot=" + fsSnapshot.getName() + " as table=" + tableName); if (cpHost != null) { - cpHost.postCloneSnapshot(reqSnapshot, htd); + cpHost.postCloneSnapshot(fsSnapshot, htd); } } }
