diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt index ed4fbd04a14..aabe671c17c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-4685.txt @@ -59,6 +59,9 @@ HDFS-4685 (Unreleased) HDFS-5860. Refactor INodeDirectory getDirectoryXFeature methods to use common getFeature helper method. (Jing Zhao via cnauroth) + HDFS-5861. Add CLI test for Ls output for extended ACL marker. + (Vinay via cnauroth) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml index 9f2ea6548dd..74bf21a4e94 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml @@ -886,5 +886,26 @@ + + ls: display extended acl marker + + -fs NAMENODE -mkdir -p /dir1/dir2 + -fs NAMENODE -setfacl -m user:charlie:rwx,group::-wx,group:sales:rwx,mask::r-x,default:user:charlie:rwx,default:group::r-x,default:group:sales:rwx,default:mask::rw- /dir1/dir2 + -fs NAMENODE -ls /dir1 + + + -fs NAMENODE -rm -R /dir1 + + + + TokenComparator + Found 1 items + + + RegexpComparator + ^drwxr-xr-x\+( )*-( )*[a-zA-z0-9]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/dir1/dir2 + + +