Author: cos
Date: Sat Jun 7 05:23:40 2014
New Revision: 1601060
URL: http://svn.apache.org/r1601060
Log:
HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin
(Contributed by Dasha Boudnik)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1601060&r1=1601059&r2=1601060&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Sat Jun 7 05:23:40 2014
@@ -156,6 +156,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6487. TestStandbyCheckpoint#testSBNCheckpoints is racy.
(Mit Desai via wang)
+ HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin
+ (Dasha Boudnik via cos)
+
OPTIMIZATIONS
HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1601060&r1=1601059&r2=1601060&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Sat Jun 7 05:23:40 2014
@@ -16118,6 +16118,364 @@
</comparators>
</test>
+ <!-- DFS tests
+ Must come before moveFromLocal tests until HDFS-6471 is fixed -->
+ <test>
+ <description>appendToFile</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -touchz /user/USERNAME/dir1/file0</command>
+ <command>-fs NAMENODE -appendToFile CLITEST_DATA/data15bytes
/user/USERNAME/dir1/file0</command>
+ <command>-fs NAMENODE -cat /user/USERNAME/dir1/file0</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>12345678901234</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>text</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -put CLITEST_DATA/data15bytes
/user/USERNAME/dir1/file0</command>
+ <command>-fs NAMENODE -text /user/USERNAME/dir1/file0</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>12345678901234</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>rmdir</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -rmdir /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -ls /user/USERNAME/</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>rmdir with ignore-fail-on-non-empty</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -put CLITEST_DATA/data15bytes
/user/USERNAME/dir1/file0</command>
+ <command>-fs NAMENODE -rmdir --ignore-fail-on-non-empty
/user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -ls /user/USERNAME/</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Found 1 items</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/user/USERNAME/dir1</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>df</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -put CLITEST_DATA/data15bytes
/user/USERNAME/dir1/file0</command>
+ <command>-fs NAMENODE -df /user/USERNAME</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Filesystem( )*Size( )*Used( )*Available(
)*Use%.*</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>expunge</description>
+ <test-commands>
+ <command>-fs NAMENODE -expunge</command>
+ </test-commands>
+ <cleanup-commands>
+ <command></command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>getmerge</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes
/user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data30bytes
/user/USERNAME/dir1</command>
+ <command>-fs NAMENODE -getmerge /user/USERNAME/dir1 data</command>
+ <command>-cat data</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ <command>rm data</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>12345678901234.*</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <!-- Tests for snapshots -->
+ <test>
+ <description>allowSnapshot</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -allowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <dfs-admin-command>-fs NAMENODE -disallowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Allowing snaphot on /user/USERNAME/dir1
succeeded</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>disallowSnapshot</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -allowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <dfs-admin-command>-fs NAMENODE -disallowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Disallowing snaphot on /user/USERNAME/dir1
succeeded</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>createSnapshot</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -allowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1
snapshot1</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1
snapshot1</command>
+ <dfs-admin-command>-fs NAMENODE -disallowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Created snapshot
/user/USERNAME/dir1/.snapshot/snapshot1</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>renameSnapshot</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -allowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1
snapshot1</command>
+ <command>-fs NAMENODE -renameSnapshot /user/USERNAME/dir1 snapshot1
snapshot2</command>
+ <command>-fs NAMENODE -ls /user/USERNAME/dir1/.snapshot</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1
snapshot2</command>
+ <dfs-admin-command>-fs NAMENODE -disallowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>Found 1 items</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/user/USERNAME/dir1/.snapshot/snapshot2</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>deleteSnapshot</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -allowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -createSnapshot /user/USERNAME/dir1
snapshot1</command>
+ <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1
snapshot1</command>
+ <command>-fs NAMENODE -ls /user/USERNAME/dir1/.snapshot</command>
+ </test-commands>
+ <cleanup-commands>
+ <dfs-admin-command>-fs NAMENODE -disallowSnapshot
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <!-- DFSadmin tests -->
+ <test>
+ <description>refreshUserToGroupsMappings</description>
+ <test-commands>
+ <dfs-admin-command>-fs NAMENODE
-refreshUserToGroupsMappings</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command></command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>refreshSuperUserGroupsConfiguration</description>
+ <test-commands>
+ <dfs-admin-command>-fs NAMENODE
-refreshSuperUserGroupsConfiguration</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command></command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>setQuota</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -setQuota 3
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>( )*3.*/user/USERNAME/dir1</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>clrQuota</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -setQuota 3
/user/USERNAME/dir1</dfs-admin-command>
+ <dfs-admin-command>-fs NAMENODE -clrQuota
/user/USERNAME/dir1</dfs-admin-command>
+ <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>( )*none.*/user/USERNAME/dir1</expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>setSpaceQuota</description>
+ <test-commands>
+ <command>-fs NAMENODE -mkdir -p /user/USERNAME/dir1</command>
+ <dfs-admin-command>-fs NAMENODE -setSpaceQuota 1G
/user/USERNAME/dir1</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>setBalancerBandwidth</description>
+ <test-commands>
+ <dfs-admin-command>-fs NAMENODE -setBalancerBandwidth
104857600</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command></command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
+ <test>
+ <description>finalizeUpgrade</description>
+ <test-commands>
+ <dfs-admin-command>-fs NAMENODE -finalizeUpgrade</dfs-admin-command>
+ </test-commands>
+ <cleanup-commands>
+ <command></command>
+ </cleanup-commands>
+ <comparators>
+ <comparator>
+ <type>ExactComparator</type>
+ <expected-output></expected-output>
+ </comparator>
+ </comparators>
+ </test>
+
<!-- Tests for moveFromLocal -->
<test> <!-- TESTED -->
<description>moveFromLocal: moving non existent file(absolute
path)</description>
