HDFS-10471. DFSAdmin#SetQuotaCommand's help msg is not correct. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1df6f573 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1df6f573 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1df6f573 Branch: refs/heads/YARN-4757 Commit: 1df6f5735c9d85e644d99d3ebfc4459490657004 Parents: ead61c4 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Jun 3 04:10:32 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Jun 3 04:10:32 2016 +0900 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 42 ++++++++++---------- .../src/test/resources/testHDFSConf.xml | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1df6f573/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java ---------------------------------------------------------------------- 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 08d3da5..45c4952 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 @@ -165,15 +165,15 @@ public class DFSAdmin extends FsShell { private static final String USAGE = "-"+NAME+" <quota> <dirname>...<dirname>"; private static final String DESCRIPTION = - "-setQuota <quota> <dirname>...<dirname>: " + - "Set the quota <quota> for each directory <dirName>.\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\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\t2. User is not an administrator, or\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"; + "-setQuota <quota> <dirname>...<dirname>: " + + "Set the quota <quota> for each directory <dirName>.\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\tFor each directory, attempt to set the quota. An error will be reported if\n" + + "\t\t1. quota is not a positive integer, or\n" + + "\t\t2. User is not an administrator, or\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"; private final long quota; // the quota to be set @@ -263,18 +263,18 @@ public class DFSAdmin extends FsShell { private static final String USAGE = "-"+NAME+" <quota> [-storageType <storagetype>] <dirname>...<dirname>"; private static final String DESCRIPTION = USAGE + ": " + - "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\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\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\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\t1. N is not a positive integer, or\n" + - "\t\t2. user is not an administrator, or\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"; + "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\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\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\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\t1. quota is not a positive integer or zero, or\n" + + "\t\t2. user is not an administrator, or\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"; private long quota; // the quota to be set private StorageType type; http://git-wip-us.apache.org/repos/asf/hadoop/blob/1df6f573/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml ---------------------------------------------------------------------- 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 086bbe9..627f0e9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml @@ -15868,7 +15868,7 @@ </comparator> <comparator> <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> <type>RegexpComparator</type> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org