You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ji...@apache.org on 2016/08/02 15:21:06 UTC
[09/40] hadoop git commit: HDFS-10696. TestHDFSCLI fails. Contributed
by Kai Sasaki.
HDFS-10696. TestHDFSCLI fails. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/414fbfab
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/414fbfab
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/414fbfab
Branch: refs/heads/yarn-native-services
Commit: 414fbfab41470923eb82a21628709e51fd3a3f6e
Parents: 8d06bda
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jul 28 16:58:23 2016 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jul 28 16:58:23 2016 +0900
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 24 +++++++++++---------
.../src/test/resources/testHDFSConf.xml | 20 ++++++++++++++++
2 files changed, 33 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/414fbfab/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 73762c6..ba09e8b 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
@@ -211,17 +211,19 @@ public class DFSAdmin extends FsShell {
private static final String NAME = "clrSpaceQuota";
private static final String USAGE = "-"+NAME+" [-storageType <storagetype>] <dirname>...<dirname>";
private static final String DESCRIPTION = USAGE + ": " +
- "Clear the space quota for each directory <dirName>.\n" +
- "\t\tFor each directory, attempt to clear the quota. An error will be reported if\n" +
- "\t\t1. the directory does not exist or is a file, or\n" +
- "\t\t2. user is not an administrator.\n" +
- "\t\tIt does not fault if the directory has no quota.\n" +
- "\t\tThe storage type specific quota is cleared when -storageType option is specified." +
- "\t\tAvailable storageTypes are \n" +
- "\t\t- RAM_DISK\n" +
- "\t\t- DISK\n" +
- "\t\t- SSD\n" +
- "\t\t- ARCHIVE";
+ "Clear the space quota for each directory <dirName>.\n" +
+ "\t\tFor each directory, attempt to clear the quota. " +
+ "An error will be reported if\n" +
+ "\t\t1. the directory does not exist or is a file, or\n" +
+ "\t\t2. user is not an administrator.\n" +
+ "\t\tIt does not fault if the directory has no quota.\n" +
+ "\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";
private StorageType type;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/414fbfab/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 627f0e9..88518bf 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
@@ -15979,6 +15979,26 @@
<type>RegexpComparator</type>
<expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output>
</comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*Available storageTypes are( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*- RAM_DISK( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*- DISK( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*- SSD( )*</expected-output>
+ </comparator>
+ <comparator>
+ <type>RegexpComparator</type>
+ <expected-output>^( |\t)*- ARCHIVE( )*</expected-output>
+ </comparator>
</comparators>
</test>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org