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

HDFS-11061. Update dfs -count -t command line help and documentation. Contributed by Yiqun Lin. 

(cherry picked from commit 112f04eb1b)
This commit is contained in:
Wei-Chiu Chuang 2016-10-28 15:33:27 -07:00
parent 2848a27700
commit 9ba283c27d
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java
View File

@ -78,12 +78,17 @@ public static void registerCommands(CommandFactory factory) {
"The -" + OPTION_EXCLUDE_SNAPSHOT + " option excludes snapshots " + "The -" + OPTION_EXCLUDE_SNAPSHOT + " option excludes snapshots " +
"from being calculated. \n" + "from being calculated. \n" +
"The -" + OPTION_TYPE + " option displays quota by storage types.\n" + "The -" + OPTION_TYPE + " option displays quota by storage types.\n" +
"It must be used with -" + OPTION_QUOTA + " option.\n" + "It should be used with -" + OPTION_QUOTA + " or -" +
OPTION_QUOTA_AND_USAGE + " option, otherwise it will be ignored.\n" +
"If a comma-separated list of storage types is given after the -" + "If a comma-separated list of storage types is given after the -" +
OPTION_TYPE + " option, \n" + OPTION_TYPE + " option, \n" +
"it displays the quota and usage for the specified types. \n" + "it displays the quota and usage for the specified types. \n" +
"Otherwise, it displays the quota and usage for all the storage \n" + "Otherwise, it displays the quota and usage for all the storage \n" +
"types that support quota \n" + "types that support quota. The list of possible storage " +
"types(case insensitive):\n" +
"ram_disk, ssd, disk and archive.\n" +
"It can also pass the value '', 'all' or 'ALL' to specify all " +
"the storage types.\n" +
"The -" + OPTION_QUOTA_AND_USAGE + " option shows the quota and \n" + "The -" + OPTION_QUOTA_AND_USAGE + " option shows the quota and \n" +
"the usage against the quota without the detailed content summary."; "the usage against the quota without the detailed content summary.";

2
hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md
View File

@ -142,7 +142,7 @@ The output columns with -count -q are: QUOTA, REMAINING\_QUOTA, SPACE\_QUOTA, RE
The output columns with -count -u are: QUOTA, REMAINING\_QUOTA, SPACE\_QUOTA, REMAINING\_SPACE\_QUOTA The output columns with -count -u are: QUOTA, REMAINING\_QUOTA, SPACE\_QUOTA, REMAINING\_SPACE\_QUOTA
The -t option shows the quota and usage for each storage type. The -t option shows the quota and usage for each storage type. The -t option is ignored if -u or -q option is not given. The list of possible parameters that can be used in -t option(case insensitive except the parameter ""): "", "all", "ram_disk", "ssd", "disk" or "archive".
The -h option shows sizes in human readable format. The -h option shows sizes in human readable format.

9
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java
View File

@ -467,11 +467,16 @@ public void getDescription() {
+ "The -v option displays a header line.\n" + "The -v option displays a header line.\n"
+ "The -x option excludes snapshots from being calculated. \n" + "The -x option excludes snapshots from being calculated. \n"
+ "The -t option displays quota by storage types.\n" + "The -t option displays quota by storage types.\n"
+ "It must be used with -q option.\n" + "It should be used with -q or -u option, "
+ "otherwise it will be ignored.\n"
+ "If a comma-separated list of storage types is given after the -t option, \n" + "If a comma-separated list of storage types is given after the -t option, \n"
+ "it displays the quota and usage for the specified types. \n" + "it displays the quota and usage for the specified types. \n"
+ "Otherwise, it displays the quota and usage for all the storage \n" + "Otherwise, it displays the quota and usage for all the storage \n"
+ "types that support quota \n" + "types that support quota. The list of possible storage "
+ "types(case insensitive):\n"
+ "ram_disk, ssd, disk and archive.\n"
+ "It can also pass the value '', 'all' or 'ALL' to specify all the "
+ "storage types.\n"
+ "The -u option shows the quota and \n" + "The -u option shows the quota and \n"
+ "the usage against the quota without the detailed content summary."; + "the usage against the quota without the detailed content summary.";