HDFS-12176. dfsadmin shows DFS Used%: NaN% if the cluster has zero block. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/770cc462 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/770cc462 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/770cc462 Branch: refs/heads/HDFS-10467 Commit: 770cc462281518545e3d1c0f8c21cf9ec9673200 Parents: e315328 Author: Akira Ajisaka <aajis...@apache.org> Authored: Mon Jul 24 16:23:01 2017 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Mon Jul 24 16:24:23 2017 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/770cc462/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 ea76093..f2233eb 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 @@ -520,9 +520,13 @@ public class DFSAdmin extends FsShell { + " (" + StringUtils.byteDesc(remaining) + ")"); System.out.println("DFS Used: " + used + " (" + StringUtils.byteDesc(used) + ")"); + double dfsUsedPercent = 0; + if (presentCapacity != 0) { + dfsUsedPercent = used/(double)presentCapacity; + } System.out.println("DFS Used%: " - + StringUtils.formatPercent(used/(double)presentCapacity, 2)); - + + StringUtils.formatPercent(dfsUsedPercent, 2)); + /* These counts are not always upto date. They are updated after * iteration of an internal list. Should be updated in a few seconds to * minutes. Use "-metaSave" to list of all such blocks and accurate --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
