Repository: hadoop Updated Branches: refs/heads/branch-2.8 616c1194f -> 9b6d27793
HDFS-11061. Update dfs -count -t command line help and documentation. Contributed by Yiqun Lin. (cherry picked from commit 112f04eb1b771e410ffd232a46e0ee2bc7b99d06) (cherry picked from commit 9ba283c27d73962a894b33a89f17d3ec697bb388) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b6d2779 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b6d2779 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b6d2779 Branch: refs/heads/branch-2.8 Commit: 9b6d27793ddb075cd6dc35796802bfebaddad339 Parents: 616c119 Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Fri Oct 28 15:33:27 2016 -0700 Committer: Wei-Chiu Chuang <weic...@apache.org> Committed: Fri Oct 28 15:37:53 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/fs/shell/Count.java | 9 +++++++-- .../hadoop-common/src/site/markdown/FileSystemShell.md | 2 +- .../src/test/java/org/apache/hadoop/fs/shell/TestCount.java | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b6d2779/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java index 16f52e3..d15ae46 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Count.java @@ -78,12 +78,17 @@ public class Count extends FsCommand { "The -" + OPTION_EXCLUDE_SNAPSHOT + " option excludes snapshots " + "from being calculated. \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 -" + OPTION_TYPE + " option, \n" + "it displays the quota and usage for the specified types. \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 usage against the quota without the detailed content summary."; http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b6d2779/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md index 1d4174c..cb60572 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/FileSystemShell.md @@ -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 -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. http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b6d2779/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java index a40027e..863dcd2 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestCount.java @@ -467,11 +467,16 @@ public class TestCount { + "The -v option displays a header line.\n" + "The -x option excludes snapshots from being calculated. \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" + "it displays the quota and usage for the specified types. \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 usage against the quota without the detailed content summary."; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
