Repository: hadoop Updated Branches: refs/heads/branch-2 dabaf582e -> 946463efe
HDFS-7213. processIncrementalBlockReport performance degradation. Contributed by Eric Payne. (cherry picked from commit e226b5b40d716b6d363c43a8783766b72734e347) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/946463ef Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/946463ef Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/946463ef Branch: refs/heads/branch-2 Commit: 946463efefec9031cacb21d5a5367acd150ef904 Parents: dabaf58 Author: Kihwal Lee <kih...@apache.org> Authored: Tue Oct 28 14:55:16 2014 -0500 Committer: Kihwal Lee <kih...@apache.org> Committed: Tue Oct 28 14:55:16 2014 -0500 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../apache/hadoop/hdfs/server/blockmanagement/BlockManager.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/946463ef/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 9c4b273..48915ab 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -59,6 +59,9 @@ Release 2.7.0 - UNRELEASED HDFS-5928. Show namespace and namenode ID on NN dfshealth page. (Siqi Li via wheat9) + HDFS-7213. processIncrementalBlockReport performance degradation. + (Eric Payne via kihwal) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/946463ef/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 4130843..7525522 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 @@ -3078,9 +3078,11 @@ public class BlockManager { + " is received from " + nodeID); } } - blockLog.debug("*BLOCK* NameNode.processIncrementalBlockReport: " + "from " + if (blockLog.isDebugEnabled()) { + blockLog.debug("*BLOCK* NameNode.processIncrementalBlockReport: " + "from " + nodeID + " receiving: " + receiving + ", " + " received: " + received + ", " + " deleted: " + deleted); + } } /**