Repository: hbase Updated Branches: refs/heads/HBASE-7912 f6949f9c1 -> bf4f533ae
HBASE-16520 TableBackupProcedure ctor should set procedure owner Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bf4f533a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bf4f533a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bf4f533a Branch: refs/heads/HBASE-7912 Commit: bf4f533aed0ad68b6349a45e0248da55eeb2b4f1 Parents: f6949f9 Author: tedyu <[email protected]> Authored: Tue Aug 30 09:04:58 2016 -0700 Committer: tedyu <[email protected]> Committed: Tue Aug 30 09:04:58 2016 -0700 ---------------------------------------------------------------------- .../hbase/backup/master/FullTableBackupProcedure.java | 10 +++++----- .../backup/master/IncrementalTableBackupProcedure.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bf4f533a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java index 7c832e4..1862d97 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/FullTableBackupProcedure.java @@ -33,24 +33,22 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupCopyService; import org.apache.hadoop.hbase.backup.BackupInfo; +import org.apache.hadoop.hbase.backup.BackupInfo.BackupPhase; +import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; import org.apache.hadoop.hbase.backup.BackupRestoreServerFactory; import org.apache.hadoop.hbase.backup.BackupType; import org.apache.hadoop.hbase.backup.HBackupFileSystem; -import org.apache.hadoop.hbase.backup.BackupInfo.BackupPhase; -import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; import org.apache.hadoop.hbase.backup.impl.BackupException; import org.apache.hadoop.hbase.backup.impl.BackupManager; import org.apache.hadoop.hbase.backup.impl.BackupManifest; -import org.apache.hadoop.hbase.backup.impl.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.impl.BackupManifest.BackupImage; +import org.apache.hadoop.hbase.backup.impl.BackupRestoreConstants; import org.apache.hadoop.hbase.backup.util.BackupClientUtil; import org.apache.hadoop.hbase.backup.util.BackupServerUtil; import org.apache.hadoop.hbase.classification.InterfaceAudience; @@ -67,6 +65,7 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; +import org.apache.hadoop.security.UserGroupInformation; @InterfaceAudience.Private public class FullTableBackupProcedure @@ -107,6 +106,7 @@ public class FullTableBackupProcedure if (tableList == null || tableList.isEmpty()) { this.tableList = new ArrayList<>(backupContext.getTables()); } + this.setOwner(env.getRequestUser().getUGI().getShortUserName()); } @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/bf4f533a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java index 05a63ce..db8e582 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/master/IncrementalTableBackupProcedure.java @@ -53,6 +53,7 @@ import org.apache.hadoop.hbase.procedure2.StateMachineProcedure; import org.apache.hadoop.hbase.protobuf.generated.BackupProtos; import org.apache.hadoop.hbase.protobuf.generated.BackupProtos.IncrementalTableBackupState; import org.apache.hadoop.hbase.protobuf.generated.BackupProtos.ServerTimestamp; +import org.apache.hadoop.security.UserGroupInformation; @InterfaceAudience.Private public class IncrementalTableBackupProcedure @@ -84,6 +85,7 @@ public class IncrementalTableBackupProcedure this.targetRootDir = targetRootDir; backupContext = backupManager.createBackupContext(backupId, BackupType.INCREMENTAL, tableList, targetRootDir, workers, (int)bandwidth); + this.setOwner(env.getRequestUser().getUGI().getShortUserName()); } @Override
