From b55c1aab7b114a4b782ed5a774909d66601a8059 Mon Sep 17 00:00:00 2001
From: Chris Nauroth <cnauroth@apache.org>
Date: Fri, 7 Mar 2014 06:06:12 +0000
Subject: [PATCH] HDFS-6069. Quash stack traces when ACLs are disabled.
 Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1575184 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                   | 2 ++
 .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index b361ae0e83c..30c4c6ea51a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -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
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
index f144c5909c9..0b7978b83a8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java
@@ -62,6 +62,7 @@ import org.apache.hadoop.ha.protocolPB.HAServiceProtocolServerSideTranslatorPB;
 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 NamenodeProtocols {
         InvalidToken.class,
         LeaseExpiredException.class,
         NSQuotaExceededException.class,
-        DSQuotaExceededException.class);
+        DSQuotaExceededException.class,
+        AclException.class);
  }
 
   /** Allow access to the client RPC server for testing */