From cddf6b4fc7c2abe93355716c380c05495f4aeb4c Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 3 Jun 2016 04:10:32 +0900 Subject: [PATCH] HDFS-10471. DFSAdmin#SetQuotaCommand's help msg is not correct. Contributed by Yiqun Lin. (cherry picked from commit 1df6f5735c9d85e644d99d3ebfc4459490657004) --- .../apache/hadoop/hdfs/tools/DFSAdmin.java | 42 +++++++++---------- .../src/test/resources/testHDFSConf.xml | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) 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 cd6b862482a..fe85bd5be7c 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 @@ -166,15 +166,15 @@ public class DFSAdmin extends FsShell { private static final String USAGE = "-"+NAME+" ..."; private static final String DESCRIPTION = - "-setQuota ...: " + - "Set the quota for each directory .\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 ...: " + + "Set the quota for each directory .\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 @@ -264,18 +264,18 @@ public class DFSAdmin extends FsShell { private static final String USAGE = "-"+NAME+" [-storageType ] ..."; private static final String DESCRIPTION = USAGE + ": " + - "Set the space quota for each directory .\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 for each directory .\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; 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 5684ee63485..268464f7639 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 @@ RegexpComparator - ^( |\t)*1. N is not a positive integer, or( )* + ^( |\t)*1. quota is not a positive integer, or( )* RegexpComparator