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

HDFS-7481. Add ACL indicator to the 'Permission Denied' exception. (Contributed by Vinayakumar B ) 

(cherry picked from commit d93f3b9815)
This commit is contained in:
Vinayakumar B 2014-12-10 08:27:15 +05:30
parent b31dfb17d8
commit 19627e5897
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,6 +301,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0 HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0
is invalid. (Akira AJISAKA via cnauroth) is invalid. (Akira AJISAKA via cnauroth)
HDFS-7481. Add ACL indicator to the "Permission Denied" exception.
(vinayakumarb)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

11
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
View File

@ -47,6 +47,12 @@ class FSPermissionChecker {
/** @return a string for throwing {@link AccessControlException} */ /** @return a string for throwing {@link AccessControlException} */
private String toAccessControlString(INode inode, int snapshotId, private String toAccessControlString(INode inode, int snapshotId,
FsAction access, FsPermission mode) { FsAction access, FsPermission mode) {
return toAccessControlString(inode, snapshotId, access, mode, false);
}
/** @return a string for throwing {@link AccessControlException} */
private String toAccessControlString(INode inode, int snapshotId, FsAction access,
FsPermission mode, boolean deniedFromAcl) {
StringBuilder sb = new StringBuilder("Permission denied: ") StringBuilder sb = new StringBuilder("Permission denied: ")
.append("user=").append(user).append(", ") .append("user=").append(user).append(", ")
.append("access=").append(access).append(", ") .append("access=").append(access).append(", ")
@ -55,6 +61,9 @@ class FSPermissionChecker {
.append(inode.getGroupName(snapshotId)).append(':') .append(inode.getGroupName(snapshotId)).append(':')
.append(inode.isDirectory() ? 'd' : '-') .append(inode.isDirectory() ? 'd' : '-')
.append(mode); .append(mode);
if (deniedFromAcl) {
sb.append("+");
}
return sb.toString(); return sb.toString();
} }
@ -338,7 +347,7 @@ class FSPermissionChecker {
} }
throw new AccessControlException( throw new AccessControlException(
toAccessControlString(inode, snapshotId, access, mode)); toAccessControlString(inode, snapshotId, access, mode, true));
} }
/** Guarded by {@link FSNamesystem#readLock()} */ /** Guarded by {@link FSNamesystem#readLock()} */