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

HDFS-10471. DFSAdmin#SetQuotaCommand's help msg is not correct. Contributed by Yiqun Lin. 

(cherry picked from commit 1df6f5735c)
This commit is contained in:
Akira Ajisaka 2016-06-03 04:10:32 +09:00
parent cbf6cacf64
commit cddf6b4fc7
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,15 +166,15 @@ public class DFSAdmin extends FsShell {
private static final String USAGE = private static final String USAGE =
"-"+NAME+" <quota> <dirname>...<dirname>"; "-"+NAME+" <quota> <dirname>...<dirname>";
private static final String DESCRIPTION = private static final String DESCRIPTION =
"-setQuota <quota> <dirname>...<dirname>: " + "-setQuota <quota> <dirname>...<dirname>: " +
"Set the quota <quota> for each directory <dirName>.\n" + "Set the quota <quota> for each directory <dirName>.\n" +
"\t\tThe directory quota is a long integer that puts a hard limit\n" + "\t\tThe directory quota is a long integer that puts a hard limit\n" +
"\t\ton the number of names in the directory tree\n" + "\t\ton the number of names in the directory tree\n" +
"\t\tFor each directory, attempt to set the quota. An error will be reported if\n" + "\t\tFor each directory, attempt to set the quota. An error will be reported if\n" +
"\t\t1. N is not a positive integer, or\n" + "\t\t1. quota is not a positive integer, or\n" +
"\t\t2. User is not an administrator, or\n" + "\t\t2. User is not an administrator, or\n" +
"\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\tNote: A quota of 1 would force the directory to remain empty.\n"; "\t\tNote: A quota of 1 would force the directory to remain empty.\n";
private final long quota; // the quota to be set private final long quota; // the quota to be set
@ -264,18 +264,18 @@ public class DFSAdmin extends FsShell {
private static final String USAGE = private static final String USAGE =
"-"+NAME+" <quota> [-storageType <storagetype>] <dirname>...<dirname>"; "-"+NAME+" <quota> [-storageType <storagetype>] <dirname>...<dirname>";
private static final String DESCRIPTION = USAGE + ": " + private static final String DESCRIPTION = USAGE + ": " +
"Set the space quota <quota> for each directory <dirName>.\n" + "Set the space quota <quota> for each directory <dirName>.\n" +
"\t\tThe space quota is a long integer that puts a hard limit\n" + "\t\tThe space quota is a long integer that puts a hard limit\n" +
"\t\ton the total size of all the files under the directory tree.\n" + "\t\ton the total size of all the files under the directory tree.\n" +
"\t\tThe extra space required for replication is also counted. E.g.\n" + "\t\tThe extra space required for replication is also counted. E.g.\n" +
"\t\ta 1GB file with replication of 3 consumes 3GB of the quota.\n\n" + "\t\ta 1GB file with replication of 3 consumes 3GB of the quota.\n\n" +
"\t\tQuota can also be specified with a binary prefix for terabytes,\n" + "\t\tQuota can also be specified with a binary prefix for terabytes,\n" +
"\t\tpetabytes etc (e.g. 50t is 50TB, 5m is 5MB, 3p is 3PB).\n" + "\t\tpetabytes etc (e.g. 50t is 50TB, 5m is 5MB, 3p is 3PB).\n" +
"\t\tFor each directory, attempt to set the quota. An error will be reported if\n" + "\t\tFor each directory, attempt to set the quota. An error will be reported if\n" +
"\t\t1. N is not a positive integer, or\n" + "\t\t1. quota is not a positive integer or zero, or\n" +
"\t\t2. user is not an administrator, or\n" + "\t\t2. user is not an administrator, or\n" +
"\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";
private long quota; // the quota to be set private long quota; // the quota to be set
private StorageType type; private StorageType type;

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

@ -15868,7 +15868,7 @@
</comparator> </comparator>
<comparator> <comparator>
<type>RegexpComparator</type> <type>RegexpComparator</type>
<expected-output>^( |\t)*1. N is not a positive integer, or( )*</expected-output> <expected-output>^( |\t)*1. quota is not a positive integer, or( )*</expected-output>
</comparator> </comparator>
<comparator> <comparator>
<type>RegexpComparator</type> <type>RegexpComparator</type>