HDFS-12791. NameNode Fsck http Connection can timeout for directories with multiple levels. Contributed by Mukul Kumar Singh.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10a1f557 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10a1f557 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10a1f557 Branch: refs/heads/HDFS-7240 Commit: 10a1f557e775e7a55958b106dd10021ac7394843 Parents: 5eb7dbe Author: Chen Liang <cli...@apache.org> Authored: Thu Nov 9 18:47:34 2017 -0800 Committer: Chen Liang <cli...@apache.org> Committed: Thu Nov 9 18:47:34 2017 -0800 ---------------------------------------------------------------------- .../apache/hadoop/hdfs/server/namenode/NamenodeFsck.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/10a1f557/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java index 5872955..b6d6971 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java @@ -471,6 +471,13 @@ public class NamenodeFsck implements DataEncryptionKeyFactory { void check(String parent, HdfsFileStatus file, Result replRes, Result ecRes) throws IOException { String path = file.getFullName(parent); + if (showprogress && + (totalDirs + totalSymlinks + replRes.totalFiles + ecRes.totalFiles) + % 100 == 0) { + out.println(); + out.flush(); + } + if (file.isDirectory()) { checkDir(path, replRes, ecRes); return; @@ -489,10 +496,6 @@ public class NamenodeFsck implements DataEncryptionKeyFactory { final Result r = file.getErasureCodingPolicy() != null ? ecRes: replRes; collectFileSummary(path, file, r, blocks); - if (showprogress && (replRes.totalFiles + ecRes.totalFiles) % 100 == 0) { - out.println(); - out.flush(); - } collectBlocksSummary(parent, file, r, blocks); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
