Repository: hadoop Updated Branches: refs/heads/branch-2.6 238458b25 -> 09dbb1156
HDFS-9434. Recommission a datanode with 500k blocks may pause NN for 30 seconds for printing info log messags. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09dbb115 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09dbb115 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09dbb115 Branch: refs/heads/branch-2.6 Commit: 09dbb11566410f2e9101555637ad81c7acc7edfd Parents: 238458b Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Thu Nov 19 14:54:01 2015 -0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Tue Nov 24 12:40:24 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/blockmanagement/BlockManager.java | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09dbb115/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 5e683e3..fb6df6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -23,6 +23,9 @@ Release 2.6.3 - UNRELEASED HDFS-9289. Make DataStreamer#block thread safe and verify genStamp in commitBlock. (Chang Li via zhz) + HDFS-9434. Recommission a datanode with 500k blocks may pause NN for 30 + seconds for printing info log messags. (szetszwo) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/09dbb115/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 feaf843..8dbee81 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 @@ -2853,11 +2853,9 @@ public class BlockManager { for(DatanodeStorageInfo storage : blocksMap.getStorages(block, State.NORMAL)) { final DatanodeDescriptor cur = storage.getDatanodeDescriptor(); if (storage.areBlockContentsStale()) { - LOG.info("BLOCK* processOverReplicatedBlock: " + - "Postponing processing of over-replicated " + - block + " since storage + " + storage - + "datanode " + cur + " does not yet have up-to-date " + - "block information."); + LOG.trace("BLOCK* processOverReplicatedBlock: Postponing {}" + + " since storage {} does not yet have up-to-date information.", + block, storage); postponeBlock(block); return; }
