Selaa lähdekoodia

HDFS-6410. DFSClient unwraps AclException in xattr methods, but those methods cannot throw AclException. (wang)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2006@1595101 13f79535-47bb-0310-9956-ffa450edef68
Andrew Wang 11 vuotta sitten
vanhempi
commit
98e6c57835

+ 3 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-2006.txt

@@ -58,3 +58,6 @@ HDFS-2006 (Unreleased)
     (umamahesh)
 
     HDFS-6372. Handle setXattr rpcIDs for OfflineEditsViewer. (umamahesh)
+
+    HDFS-6410. DFSClient unwraps AclException in xattr methods, but those
+    methods cannot throw AclException. (wang)

+ 0 - 5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java

@@ -2767,7 +2767,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory {
       namenode.setXAttr(src, XAttrHelper.buildXAttr(name, value), flag);
     } catch (RemoteException re) {
       throw re.unwrapRemoteException(AccessControlException.class,
-                                     AclException.class,
                                      FileNotFoundException.class,
                                      NSQuotaExceededException.class,
                                      SafeModeException.class,
@@ -2784,7 +2783,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory {
       return XAttrHelper.getFirstXAttrValue(result);
     } catch(RemoteException re) {
       throw re.unwrapRemoteException(AccessControlException.class,
-                                     AclException.class,
                                      FileNotFoundException.class,
                                      UnresolvedPathException.class);
     }
@@ -2796,7 +2794,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory {
       return XAttrHelper.buildXAttrMap(namenode.getXAttrs(src, null));
     } catch(RemoteException re) {
       throw re.unwrapRemoteException(AccessControlException.class,
-                                     AclException.class,
                                      FileNotFoundException.class,
                                      UnresolvedPathException.class);
     }
@@ -2810,7 +2807,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory {
           src, XAttrHelper.buildXAttrs(names)));
     } catch(RemoteException re) {
       throw re.unwrapRemoteException(AccessControlException.class,
-                                     AclException.class,
                                      FileNotFoundException.class,
                                      UnresolvedPathException.class);
     }
@@ -2822,7 +2818,6 @@ public class DFSClient implements java.io.Closeable, RemotePeerFactory {
       namenode.removeXAttr(src, XAttrHelper.buildXAttr(name));
     } catch(RemoteException re) {
       throw re.unwrapRemoteException(AccessControlException.class,
-                                     AclException.class,
                                      FileNotFoundException.class,
                                      NSQuotaExceededException.class,
                                      SafeModeException.class,