Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20825 Fix pre and post hooks of CloneSnapshot and RestoreSnapshot for Access checks 

Signed-off-by: Josh Elser <elserj@apache.org>
Signed-off-by: Ted Yu <tyu@apache.org>
This commit is contained in:
Ankit Singhal 2018-06-29 16:32:17 -04:00 committed by Josh Elser
parent 632aaef88b
commit 34e23fe425
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
View File

@ -697,7 +697,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable
TableDescriptor htd = TableDescriptorBuilder.copy(tableName, snapshotTableDesc); TableDescriptor htd = TableDescriptorBuilder.copy(tableName, snapshotTableDesc);
org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null; org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null;
if (cpHost != null) { if (cpHost != null) {
snapshotPOJO = ProtobufUtil.createSnapshotDesc(reqSnapshot); snapshotPOJO = ProtobufUtil.createSnapshotDesc(snapshot);
cpHost.preCloneSnapshot(snapshotPOJO, htd); cpHost.preCloneSnapshot(snapshotPOJO, htd);
} }
long procId; long procId;
@ -827,7 +827,7 @@ public class SnapshotManager extends MasterProcedureManager implements Stoppable
// call Coprocessor pre hook // call Coprocessor pre hook
org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null; org.apache.hadoop.hbase.client.SnapshotDescription snapshotPOJO = null;
if (cpHost != null) { if (cpHost != null) {
snapshotPOJO = ProtobufUtil.createSnapshotDesc(reqSnapshot); snapshotPOJO = ProtobufUtil.createSnapshotDesc(snapshot);
cpHost.preRestoreSnapshot(snapshotPOJO, snapshotTableDesc); cpHost.preRestoreSnapshot(snapshotPOJO, snapshotTableDesc);
} }