Author: cnauroth
Date: Fri Mar 7 06:06:12 2014
New Revision: 1575184
URL: http://svn.apache.org/r1575184
Log:
HDFS-6069. Quash stack traces when ACLs are disabled. Contributed by Chris
Nauroth.
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1575184&r1=1575183&r2=1575184&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Fri Mar 7
06:06:12 2014
@@ -866,6 +866,8 @@ Release 2.4.0 - UNRELEASED
HDFS-6063. TestAclCLI fails intermittently when running test 24:
copyFromLocal. (cnauroth)
+ HDFS-6069. Quash stack traces when ACLs are disabled. (cnauroth)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java?rev=1575184&r1=1575183&r2=1575184&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
(original)
+++
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
Fri Mar 7 06:06:12 2014
@@ -62,6 +62,7 @@ import org.apache.hadoop.ha.protocolPB.H
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.HDFSPolicyProvider;
+import org.apache.hadoop.hdfs.protocol.AclException;
import org.apache.hadoop.hdfs.protocol.AlreadyBeingCreatedException;
import org.apache.hadoop.hdfs.protocol.BlockListAsLongs;
import org.apache.hadoop.hdfs.protocol.CacheDirectiveEntry;
@@ -356,7 +357,8 @@ class NameNodeRpcServer implements Namen
InvalidToken.class,
LeaseExpiredException.class,
NSQuotaExceededException.class,
- DSQuotaExceededException.class);
+ DSQuotaExceededException.class,
+ AclException.class);
}
/** Allow access to the client RPC server for testing */
