big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-13647. Fix the description of storageType option for space quota. Contributed by Takanobu Asanuma.

Browse Source
This commit is contained in:
Ayush Saxena 2019-07-17 23:17:31 +05:30
parent eb0849b547
commit af0665c7f5
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,10 +240,10 @@ private static class ClearSpaceQuotaCommand extends DFSAdminCommand {
"\t\tThe storage type specific quota is cleared when -storageType " + "\t\tThe storage type specific quota is cleared when -storageType " +
"option is specified.\n" + "option is specified.\n" +
"\t\tAvailable storageTypes are \n" + "\t\tAvailable storageTypes are \n" +
"\t\t- RAM_DISK\n" +
"\t\t- DISK\n" + "\t\t- DISK\n" +
"\t\t- SSD\n" + "\t\t- SSD\n" +
"\t\t- ARCHIVE"; "\t\t- ARCHIVE\n" +
"\t\t- PROVIDED";
private StorageType type; private StorageType type;
@ -304,10 +304,10 @@ private static class SetSpaceQuotaCommand extends DFSAdminCommand {
"\t\t3. the directory does not exist or is a file.\n" + "\t\t3. the directory does not exist or is a file.\n" +
"\t\tThe storage type specific quota is set when -storageType option is specified.\n" + "\t\tThe storage type specific quota is set when -storageType option is specified.\n" +
"\t\tAvailable storageTypes are \n" + "\t\tAvailable storageTypes are \n" +
"\t\t- RAM_DISK\n" +
"\t\t- DISK\n" + "\t\t- DISK\n" +
"\t\t- SSD\n" + "\t\t- SSD\n" +
"\t\t- ARCHIVE"; "\t\t- ARCHIVE\n" +
"\t\t- PROVIDED";
private long quota; // the quota to be set private long quota; // the quota to be set
private StorageType type; private StorageType type;

4
hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsQuotaAdminGuide.md
View File

@ -96,7 +96,7 @@ Quotas are managed by a set of commands available only to the administrator.
integer, the directory does not exist or it is a file, or the integer, the directory does not exist or it is a file, or the
directory would immediately exceed the new quota. The storage type directory would immediately exceed the new quota. The storage type
specific quota is set when -storageType option is specified. Available specific quota is set when -storageType option is specified. Available
storageTypes are RAM_DISK,DISK,SSD,ARCHIVE. storageTypes are DISK,SSD,ARCHIVE,PROVIDED.
* `hdfs dfsadmin -clrSpaceQuota -storageType <storagetype> <directory>...<directory>` * `hdfs dfsadmin -clrSpaceQuota -storageType <storagetype> <directory>...<directory>`
@ -104,7 +104,7 @@ Quotas are managed by a set of commands available only to the administrator.
for each directory, with faults reported if the directory does not exist or for each directory, with faults reported if the directory does not exist or
it is a file. It is not a fault if the directory has no storage type quota on it is a file. It is not a fault if the directory has no storage type quota on
for storage type specified. The storage type specific quota is cleared when -storageType for storage type specified. The storage type specific quota is cleared when -storageType
option is specified. Available storageTypes are RAM_DISK,DISK,SSD,ARCHIVE. option is specified. Available storageTypes are DISK,SSD,ARCHIVE,PROVIDED.
Reporting Command Reporting Command
----------------- -----------------

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

@ -16106,10 +16106,6 @@
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*Available storageTypes are( )*</expected-output> <expected-output>^( |\t)*Available storageTypes are( )*</expected-output>
</comparator> </comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- RAM_DISK( )*</expected-output>
</comparator>
<comparator> <comparator>
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*- DISK( )*</expected-output> <expected-output>^( |\t)*- DISK( )*</expected-output>
@ -16122,6 +16118,10 @@
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*- ARCHIVE( )*</expected-output> <expected-output>^( |\t)*- ARCHIVE( )*</expected-output>
</comparator> </comparator>
<comparator>
<type>RegexpComparator</type>
<expected-output>^( |\t)*- PROVIDED( )*</expected-output>
</comparator>
</comparators> </comparators>
</test> </test>