Uh oh!
There was an error while loading. Please reload this page.
HBASE-22776 Rename config names in user scan snapshot feature#440
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -119,7 +119,7 @@ public Optional<MasterObserver> getMasterObserver() { | ||
| public void preMasterInitialization(ObserverContext<MasterCoprocessorEnvironment> c) | ||
| throws IOException { | ||
| if (c.getEnvironment().getConfiguration() | ||
| .getBoolean(SnapshotScannerHDFSAclHelper.ACL_SYNC_TO_HDFS_ENABLE, false)) { | ||
| MasterCoprocessorEnvironment mEnv = c.getEnvironment(); | ||
| if (!(mEnv instanceof HasMasterServices)) { | ||
| throw new IOException("Does not implement HMasterServices"); | ||
| @@ -133,7 +133,7 @@ public void preMasterInitialization(ObserverContext<MasterCoprocessorEnvironment | ||
| userProvider = UserProvider.instantiate(c.getEnvironment().getConfiguration()); | ||
| } else { | ||
| LOG.warn("Try to initialize the coprocessor SnapshotScannerHDFSAclController but failure " | ||
| + "because the config " + SnapshotScannerHDFSAclHelper.ACL_SYNC_TO_HDFS_ENABLE | ||
| + " is false."); | ||
| } | ||
| } | ||
| @@ -213,7 +213,9 @@ public void postCompletedSnapshotAction(ObserverContext<MasterCoprocessorEnviron | ||
| public void postCompletedTruncateTableAction(ObserverContext<MasterCoprocessorEnvironment> c, | ||
| TableName tableName) throws IOException { | ||
| if (needHandleTableHdfsAcl(tableName, "truncateTable " + tableName)) { | ||
| // 1. create tmp table directories | ||
| hdfsAclHelper.createTableDirectories(tableName); | ||
| // 2. Since the table directories is recreated, so add HDFS acls again | ||
| Set<String> users = hdfsAclHelper.getUsersWithTableReadAction(tableName, false, false); | ||
| hdfsAclHelper.addTableAcl(tableName, users, "truncate"); | ||
| } | ||
| @@ -233,9 +235,11 @@ public void postDeleteTable(ObserverContext<MasterCoprocessorEnvironment> ctx, | ||
| try (Table aclTable = | ||
| ctx.getEnvironment().getConnection().getTable(PermissionStorage.ACL_TABLE_NAME)) { | ||
| Set<String> users = SnapshotScannerHDFSAclStorage.getTableUsers(aclTable, tableName); | ||
| // 1. Remove table archive directory default ACLs | ||
| hdfsAclHelper.removeTableDefaultAcl(tableName, users); | ||
openinx marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| // 2. Delete table owner permission is synced to HDFS in acl table | ||
| SnapshotScannerHDFSAclStorage.deleteTableHdfsAcl(aclTable, tableName); | ||
| // 3. Remove namespace access acls | ||
| Set<String> removeUsers = filterUsersToRemoveNsAccessAcl(aclTable, tableName, users); | ||
| if (removeUsers.size() > 0) { | ||
| hdfsAclHelper.removeNamespaceAccessAcl(tableName, removeUsers, "delete"); | ||
| @@ -251,7 +255,7 @@ public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx, | ||
| try (Table aclTable = | ||
| ctx.getEnvironment().getConnection().getTable(PermissionStorage.ACL_TABLE_NAME)) { | ||
| if (needHandleTableHdfsAcl(currentDescriptor, "modifyTable " + tableName) | ||
| && !hdfsAclHelper.isAclSyncToHdfsEnabled(oldDescriptor)) { | ||
| // 1. Create table directories used for acl inherited | ||
| hdfsAclHelper.createTableDirectories(tableName); | ||
| // 2. Add table users HDFS acls | ||
| @@ -264,7 +268,7 @@ public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx, | ||
| SnapshotScannerHDFSAclStorage.addUserTableHdfsAcl(ctx.getEnvironment().getConnection(), | ||
| tableUsers, tableName); | ||
| } else if (needHandleTableHdfsAcl(oldDescriptor, "modifyTable " + tableName) | ||
| && !hdfsAclHelper.isAclSyncToHdfsEnabled(currentDescriptor)) { | ||
| // 1. Remove empty table directories | ||
| List<Path> tableRootPaths = hdfsAclHelper.getTableRootPaths(tableName, false); | ||
| for (Path path : tableRootPaths) { | ||
| @@ -290,17 +294,24 @@ public void postModifyTable(ObserverContext<MasterCoprocessorEnvironment> ctx, | ||
| public void postDeleteNamespace(ObserverContext<MasterCoprocessorEnvironment> ctx, | ||
| String namespace) throws IOException { | ||
| if (checkInitialized("deleteNamespace " + namespace)) { | ||
| try (Table aclTable = | ||
| ctx.getEnvironment().getConnection().getTable(PermissionStorage.ACL_TABLE_NAME)) { | ||
| // 1. Delete namespace archive dir default ACLs | ||
| Set<String> users = SnapshotScannerHDFSAclStorage.getEntryUsers(aclTable, | ||
| PermissionStorage.toNamespaceEntry(Bytes.toBytes(namespace))); | ||
| hdfsAclHelper.removeNamespaceDefaultAcl(namespace, users); | ||
openinx marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| // 2. Record namespace user acl is not synced to HDFS | ||
| SnapshotScannerHDFSAclStorage.deleteNamespaceHdfsAcl(ctx.getEnvironment().getConnection(), | ||
| namespace); | ||
| // 3. Delete tmp namespace directory | ||
| /** | ||
| * Delete namespace tmp directory because it's created by this coprocessor when namespace is | ||
| * created to make namespace default acl can be inherited by tables. The namespace data | ||
| * directory is deleted by DeleteNamespaceProcedure, the namespace archive directory is | ||
| * deleted by HFileCleaner. | ||
| */ | ||
| hdfsAclHelper.deleteEmptyDir(pathHelper.getTmpNsDir(namespace)); | ||
| } | ||
| } | ||
| } | ||
| @@ -364,7 +375,9 @@ public void postGrant(ObserverContext<MasterCoprocessorEnvironment> c, | ||
| UserPermission tPerm = getUserTablePermission(conf, userName, tableName); | ||
| if (tPerm != null && hdfsAclHelper.containReadAction(tPerm)) { | ||
| if (!isHdfsAclSet(aclTable, userName, tableName)) { | ||
| // 1. create table dirs | ||
| hdfsAclHelper.createTableDirectories(tableName); | ||
| // 2. Add HDFS acl | ||
| hdfsAclHelper.grantAcl(userPermission, new HashSet<>(0), new HashSet<>(0)); | ||
| } | ||
| // 2. Record table acl is synced to HDFS | ||
| @@ -547,13 +560,13 @@ private boolean needHandleTableHdfsAcl(TablePermission tablePermission) throws I | ||
| private boolean needHandleTableHdfsAcl(TableName tableName, String operation) throws IOException { | ||
| return !tableName.isSystemTable() && checkInitialized(operation) && hdfsAclHelper | ||
| .isAclSyncToHdfsEnabled(masterServices.getTableDescriptors().get(tableName)); | ||
| } | ||
| private boolean needHandleTableHdfsAcl(TableDescriptor tableDescriptor, String operation) { | ||
| TableName tableName = tableDescriptor.getTableName(); | ||
| return !tableName.isSystemTable() && checkInitialized(operation) | ||
| && hdfsAclHelper.isAclSyncToHdfsEnabled(tableDescriptor); | ||
| } | ||
| private User getActiveUser(ObserverContext<?> ctx) throws IOException { | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why create the table directories here ? I guess the TruncateTableProcedure will create the dir ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The tmp table dir is deleted after truncate table, so recreate this directory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So please add the comment to say : it's mainly used for creating tmp table dir here because ...