Repository: hbase Updated Branches: refs/heads/branch-2.1 4a80b19d7 -> d22c6de64
HBASE-20825 Fix pre and post hooks of CloneSnapshot and RestoreSnapshot for Access checks Signed-off-by: Josh Elser <[email protected]> Signed-off-by: Ted Yu <[email protected]> Signed-off-by: zhangduo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d22c6de6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d22c6de6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d22c6de6 Branch: refs/heads/branch-2.1 Commit: d22c6de6484607d0082a48b686c706d8e73650f1 Parents: 4a80b19 Author: Ankit Singhal <[email protected]> Authored: Fri Jun 29 16:32:17 2018 -0400 Committer: zhangduo <[email protected]> Committed: Tue Jul 3 10:06:13 2018 +0800 ---------------------------------------------------------------------- .../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/d22c6de6/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); }
