diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java index 78c02a60fc6..57776b6a8fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java @@ -240,10 +240,10 @@ private static class ClearSpaceQuotaCommand extends DFSAdminCommand { "\t\tThe storage type specific quota is cleared when -storageType " + "option is specified.\n" + "\t\tAvailable storageTypes are \n" + - "\t\t- RAM_DISK\n" + "\t\t- DISK\n" + "\t\t- SSD\n" + - "\t\t- ARCHIVE"; + "\t\t- ARCHIVE\n" + + "\t\t- PROVIDED"; 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\tThe storage type specific quota is set when -storageType option is specified.\n" + "\t\tAvailable storageTypes are \n" + - "\t\t- RAM_DISK\n" + "\t\t- DISK\n" + "\t\t- SSD\n" + - "\t\t- ARCHIVE"; + "\t\t- ARCHIVE\n" + + "\t\t- PROVIDED"; private long quota; // the quota to be set private StorageType type; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsQuotaAdminGuide.md b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsQuotaAdminGuide.md index 461bdbff1aa..9da28e3290b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsQuotaAdminGuide.md +++ b/hadoop-hdfs-project/hadoop-hdfs/src/site/markdown/HdfsQuotaAdminGuide.md @@ -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 directory would immediately exceed the new quota. The storage type 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 ...` @@ -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 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 - option is specified. Available storageTypes are RAM_DISK,DISK,SSD,ARCHIVE. + option is specified. Available storageTypes are DISK,SSD,ARCHIVE,PROVIDED. Reporting Command ----------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml index 4ab093bd15d..ea327c4ffb6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -16106,10 +16106,6 @@ RegexpComparator ^( |\t)*Available storageTypes are( )* - - RegexpComparator - ^( |\t)*- RAM_DISK( )* - RegexpComparator ^( |\t)*- DISK( )* @@ -16122,6 +16118,10 @@ RegexpComparator ^( |\t)*- ARCHIVE( )* + + RegexpComparator + ^( |\t)*- PROVIDED( )* +