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

HADOOP-12776. Remove getaclstatus call for non-acl commands in getfacl. (Contributed by Brahma Reddy Battula) 

(cherry picked from commit c78740a979)
(cherry picked from commit 488e6cbe16)
This commit is contained in:
Vinayakumar B 2016-02-12 11:53:28 +05:30
parent 58d4c045e6
commit 26934cf6c7
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -402,6 +402,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12699. TestKMS#testKMSProvider intermittently fails during HADOOP-12699. TestKMS#testKMSProvider intermittently fails during
'test rollover draining'. (Xiao Chen via wang) 'test rollover draining'. (Xiao Chen via wang)
HADOOP-12776. Remove getaclstatus call for non-acl commands in getfacl.
(Brahma Reddy Battula via vinayakumarb)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp HADOOP-11785. Reduce the number of listStatus operation in distcp

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

@ -86,9 +86,15 @@ class AclCommands extends FsCommand {
(perm.getOtherAction().implies(FsAction.EXECUTE) ? "t" : "T")); (perm.getOtherAction().implies(FsAction.EXECUTE) ? "t" : "T"));
} }
AclStatus aclStatus = item.fs.getAclStatus(item.path); AclStatus aclStatus = null;
List<AclEntry> entries = perm.getAclBit() ? aclStatus.getEntries() List<AclEntry> entries = null;
: Collections.<AclEntry> emptyList(); if (perm.getAclBit()) {
aclStatus = item.fs.getAclStatus(item.path);
entries = aclStatus.getEntries();
} else {
aclStatus = null;
entries = Collections.<AclEntry> emptyList();
}
ScopedAclEntries scopedEntries = new ScopedAclEntries( ScopedAclEntries scopedEntries = new ScopedAclEntries(
AclUtil.getAclFromPermAndEntries(perm, entries)); AclUtil.getAclFromPermAndEntries(perm, entries));
printAclEntriesForSingleScope(aclStatus, perm, printAclEntriesForSingleScope(aclStatus, perm,