[14/50] [abbrv] hadoop git commit: HDFS-7481. Add ACL indicator to the 'Permission Denied' exception. (Contributed by Vinayakumar B )

2014-12-15 Thread kasha
HDFS-7481. Add ACL indicator to the 'Permission Denied' exception. (Contributed 
by Vinayakumar B )


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d93f3b98
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d93f3b98
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d93f3b98

Branch: refs/heads/YARN-2139
Commit: d93f3b9815f90d24c838574a56013e6dc60dc5ad
Parents: 437322a
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Dec 10 08:27:15 2014 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Dec 10 08:27:15 2014 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/server/namenode/FSPermissionChecker.java | 11 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d93f3b98/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9398429..d141439 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -558,6 +558,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0
 is invalid. (Akira AJISAKA via cnauroth)
 
+HDFS-7481. Add ACL indicator to the Permission Denied exception.
+(vinayakumarb)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d93f3b98/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
index 8de8c54..0508484 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
@@ -47,6 +47,12 @@ class FSPermissionChecker {
   /** @return a string for throwing {@link AccessControlException} */
   private String toAccessControlString(INode inode, int snapshotId,
   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: )
   .append(user=).append(user).append(, )
   .append(access=).append(access).append(, )
@@ -55,6 +61,9 @@ class FSPermissionChecker {
   .append(inode.getGroupName(snapshotId)).append(':')
   .append(inode.isDirectory() ? 'd' : '-')
   .append(mode);
+if (deniedFromAcl) {
+  sb.append(+);
+}
 return sb.toString();
   }
 
@@ -338,7 +347,7 @@ class FSPermissionChecker {
 }
 
 throw new AccessControlException(
-  toAccessControlString(inode, snapshotId, access, mode));
+  toAccessControlString(inode, snapshotId, access, mode, true));
   }
 
   /** Guarded by {@link FSNamesystem#readLock()} */



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

2014-12-09 Thread vinayakumarb
Repository: hadoop
Updated Branches:
  refs/heads/trunk 437322afc - d93f3b981


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d93f3b98
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d93f3b98
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d93f3b98

Branch: refs/heads/trunk
Commit: d93f3b9815f90d24c838574a56013e6dc60dc5ad
Parents: 437322a
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Dec 10 08:27:15 2014 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Dec 10 08:27:15 2014 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/server/namenode/FSPermissionChecker.java | 11 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d93f3b98/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9398429..d141439 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -558,6 +558,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0
 is invalid. (Akira AJISAKA via cnauroth)
 
+HDFS-7481. Add ACL indicator to the Permission Denied exception.
+(vinayakumarb)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d93f3b98/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
index 8de8c54..0508484 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
@@ -47,6 +47,12 @@ class FSPermissionChecker {
   /** @return a string for throwing {@link AccessControlException} */
   private String toAccessControlString(INode inode, int snapshotId,
   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: )
   .append(user=).append(user).append(, )
   .append(access=).append(access).append(, )
@@ -55,6 +61,9 @@ class FSPermissionChecker {
   .append(inode.getGroupName(snapshotId)).append(':')
   .append(inode.isDirectory() ? 'd' : '-')
   .append(mode);
+if (deniedFromAcl) {
+  sb.append(+);
+}
 return sb.toString();
   }
 
@@ -338,7 +347,7 @@ class FSPermissionChecker {
 }
 
 throw new AccessControlException(
-  toAccessControlString(inode, snapshotId, access, mode));
+  toAccessControlString(inode, snapshotId, access, mode, true));
   }
 
   /** Guarded by {@link FSNamesystem#readLock()} */



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

2014-12-09 Thread vinayakumarb
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 b31dfb17d - 19627e589


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

(cherry picked from commit d93f3b9815f90d24c838574a56013e6dc60dc5ad)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19627e58
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19627e58
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19627e58

Branch: refs/heads/branch-2
Commit: 19627e5897388dadb85bee5f022ee195d189844b
Parents: b31dfb1
Author: Vinayakumar B vinayakum...@apache.org
Authored: Wed Dec 10 08:27:15 2014 +0530
Committer: Vinayakumar B vinayakum...@apache.org
Committed: Wed Dec 10 08:32:39 2014 +0530

--
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt  |  3 +++
 .../hadoop/hdfs/server/namenode/FSPermissionChecker.java | 11 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19627e58/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
--
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index a04e7cc..2496083 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -301,6 +301,9 @@ Release 2.7.0 - UNRELEASED
 HDFS-7473. Document setting dfs.namenode.fs-limits.max-directory-items to 0
 is invalid. (Akira AJISAKA via cnauroth)
 
+HDFS-7481. Add ACL indicator to the Permission Denied exception.
+(vinayakumarb)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19627e58/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
index 8de8c54..0508484 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
@@ -47,6 +47,12 @@ class FSPermissionChecker {
   /** @return a string for throwing {@link AccessControlException} */
   private String toAccessControlString(INode inode, int snapshotId,
   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: )
   .append(user=).append(user).append(, )
   .append(access=).append(access).append(, )
@@ -55,6 +61,9 @@ class FSPermissionChecker {
   .append(inode.getGroupName(snapshotId)).append(':')
   .append(inode.isDirectory() ? 'd' : '-')
   .append(mode);
+if (deniedFromAcl) {
+  sb.append(+);
+}
 return sb.toString();
   }
 
@@ -338,7 +347,7 @@ class FSPermissionChecker {
 }
 
 throw new AccessControlException(
-  toAccessControlString(inode, snapshotId, access, mode));
+  toAccessControlString(inode, snapshotId, access, mode, true));
   }
 
   /** Guarded by {@link FSNamesystem#readLock()} */