Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-10696. TestHDFSCLI fails. Contributed by Kai Sasaki. 

(cherry picked from commit 414fbfab41)
(cherry picked from commit ab49c2b399)
This commit is contained in:
Akira Ajisaka 2016-07-28 16:58:23 +09:00
parent 71c49b1786
commit 960caf624d
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
View File

@ -211,11 +211,13 @@ public class DFSAdmin extends FsShell {
private static final String USAGE = "-"+NAME+" [-storageType <storagetype>] <dirname>...<dirname>"; private static final String USAGE = "-"+NAME+" [-storageType <storagetype>] <dirname>...<dirname>";
private static final String DESCRIPTION = USAGE + ": " + private static final String DESCRIPTION = USAGE + ": " +
"Clear the space quota for each directory <dirName>.\n" + "Clear the space quota for each directory <dirName>.\n" +
"\t\tFor each directory, attempt to clear the quota. An error will be reported if\n" + "\t\tFor each directory, attempt to clear the quota. " +
"An error will be reported if\n" +
"\t\t1. the directory does not exist or is a file, or\n" + "\t\t1. the directory does not exist or is a file, or\n" +
"\t\t2. user is not an administrator.\n" + "\t\t2. user is not an administrator.\n" +
"\t\tIt does not fault if the directory has no quota.\n" + "\t\tIt does not fault if the directory has no quota.\n" +
"\t\tThe storage type specific quota is cleared when -storageType option is specified." + "\t\tThe storage type specific quota is cleared when -storageType " +
"option is specified.\n" +
"\t\tAvailable storageTypes are \n" + "\t\tAvailable storageTypes are \n" +
"\t\t- RAM_DISK\n" + "\t\t- RAM_DISK\n" +
"\t\t- DISK\n" + "\t\t- DISK\n" +

20
hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
View File

@ -15979,6 +15979,26 @@
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output> <expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output>
</comparator> </comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*Available storageTypes are( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- RAM_DISK( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- DISK( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- SSD( )*</expected-output>
</comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- ARCHIVE( )*</expected-output>
</comparator>
</comparators> </comparators>
</test> </test>