big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-16443. Improve help text for setfacl --set option.

Browse Source 
Contributed by S O'Donnell.

Change-Id: I1da46c4c414a5d2b07ee15867508f0799440a413
This commit is contained in:
S O'Donnell 2019-07-22 16:49:10 +01:00 committed by Steve Loughran
parent 377f95bbe8
commit eb36b09cb7
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/AclCommands.java
View File

@ -173,7 +173,11 @@ public static class SetfaclCommand extends FsCommand {
+ " -x :Remove specified ACL entries. Other ACL entries are retained.\n" + " -x :Remove specified ACL entries. Other ACL entries are retained.\n"
+ " --set :Fully replace the ACL, discarding all existing entries." + " --set :Fully replace the ACL, discarding all existing entries."
+ " The <acl_spec> must include entries for user, group, and others" + " The <acl_spec> must include entries for user, group, and others"
+ " for compatibility with permission bits.\n" + " for compatibility with permission bits. If the ACL spec contains"
+ " only access entries, then the existing default entries are retained"
+ ". If the ACL spec contains only default entries, then the existing"
+ " access entries are retained. If the ACL spec contains both access"
+ " and default entries, then both are replaced.\n"
+ " <acl_spec>: Comma separated list of ACL entries.\n" + " <acl_spec>: Comma separated list of ACL entries.\n"
+ " <path>: File or directory to modify.\n"; + " <path>: File or directory to modify.\n";

2
hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
View File

@ -638,7 +638,7 @@ Options:
* -R: Apply operations to all files and directories recursively. * -R: Apply operations to all files and directories recursively.
* -m: Modify ACL. New entries are added to the ACL, and existing entries are retained. * -m: Modify ACL. New entries are added to the ACL, and existing entries are retained.
* -x: Remove specified ACL entries. Other ACL entries are retained. * -x: Remove specified ACL entries. Other ACL entries are retained.
* ``--set``: Fully replace the ACL, discarding all existing entries. The *acl\_spec* must include entries for user, group, and others for compatibility with permission bits. * ``--set``: Fully replace the ACL, discarding all existing entries. The *acl\_spec* must include entries for user, group, and others for compatibility with permission bits. If the ACL spec contains only access entries, then the existing default entries are retained. If the ACL spec contains only default entries, then the existing access entries are retained. If the ACL spec contains both access and default entries, then both are replaced.
* *acl\_spec*: Comma separated list of ACL entries. * *acl\_spec*: Comma separated list of ACL entries.
* *path*: File or directory to modify. * *path*: File or directory to modify.