HBASE-20825 Fix pre and post hooks of CloneSnapshot and RestoreSnapshot for Access checks
Signed-off-by: Josh Elser <els...@apache.org> Signed-off-by: Ted Yu <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/490ca0ce Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/490ca0ce Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/490ca0ce Branch: refs/heads/branch-2 Commit: 490ca0ce203a0b3e0d4d0cb166ddfbde30f0e273 Parents: e2d0cdb Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Fri Jun 29 16:32:17 2018 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Jun 29 16:33:34 2018 -0400 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/490ca0ce/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 1abd605..bc472d3 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 @@ -697,7 +697,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable TableDescriptor htd = TableDescriptorBuilder.copy(tableName, snapshotTableDesc); org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null; if (cpHost != null) { - snapshotPOJO = ProtobufUtil.createSnapshotDesc(reqSnapshot); + snapshotPOJO = ProtobufUtil.createSnapshotDesc(snapshot); cpHost.preCloneSnapshot(snapshotPOJO, htd); } long procId; @@ -827,7 +827,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable // call Coprocessor pre hook org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null; if (cpHost != null) { - snapshotPOJO = ProtobufUtil.createSnapshotDesc(reqSnapshot); + snapshotPOJO = ProtobufUtil.createSnapshotDesc(snapshot); cpHost.preRestoreSnapshot(snapshotPOJO, snapshotTableDesc); }
