HDFS-9839. Reduce verbosity of processReport logging. (Contributed by Arpit Agarwal)
This closes #78 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7660cfd9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7660cfd9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7660cfd9 Branch: refs/heads/branch-2 Commit: 7660cfd91a9c3ab1311803ea882957d611887398 Parents: 7f67379 Author: Arpit Agarwal <[email protected]> Authored: Sat Feb 20 23:19:09 2016 -0800 Committer: Arpit Agarwal <[email protected]> Committed: Sat Feb 20 23:20:18 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hdfs/server/blockmanagement/BlockManager.java | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7660cfd9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 4c62a01..5afceca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1872,6 +1872,8 @@ Release 2.8.0 - UNRELEASED HDFS-6832. Fix the usage of 'hdfs namenode' command. (Manjunath Ballur via aajisaka) + HDFS-9839. Reduce verbosity of processReport logging. (Arpit Agarwal) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/7660cfd9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java index cb23b9a..fb0707b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java @@ -1865,7 +1865,7 @@ public class BlockManager implements BlockStatsMXBean { final long startTime = Time.monotonicNow(); //after acquiring write lock final long endTime; DatanodeDescriptor node; - Collection<Block> invalidatedBlocks = null; + Collection<Block> invalidatedBlocks = Collections.emptyList(); try { node = datanodeManager.getDatanode(nodeID); @@ -1940,11 +1940,9 @@ public class BlockManager implements BlockStatsMXBean { namesystem.writeUnlock(); } - if (invalidatedBlocks != null) { - for (Block b : invalidatedBlocks) { - blockLog.info("BLOCK* processReport: {} on node {} size {} does not " + - "belong to any file", b, node, b.getNumBytes()); - } + for (Block b : invalidatedBlocks) { + blockLog.debug("BLOCK* processReport: {} on node {} size {} does not " + + "belong to any file", b, node, b.getNumBytes()); } // Log the block report processing stats from Namenode perspective @@ -1953,9 +1951,11 @@ public class BlockManager implements BlockStatsMXBean { metrics.addBlockReport((int) (endTime - startTime)); } blockLog.info("BLOCK* processReport: from storage {} node {}, " + - "blocks: {}, hasStaleStorage: {}, processing time: {} msecs", storage - .getStorageID(), nodeID, newReport.getNumberOfBlocks(), - node.hasStaleStorages(), (endTime - startTime)); + "blocks: {}, hasStaleStorage: {}, processing time: {} msecs, " + + "invalidatedBlocks: {}", storage.getStorageID(), nodeID, + newReport.getNumberOfBlocks(), + node.hasStaleStorages(), (endTime - startTime), + invalidatedBlocks.size()); return !node.hasStaleStorages(); }
