From d2518fd5627220736e691b4a55638fc1f57d612e Mon Sep 17 00:00:00 2001 From: Tsz-Wo Nicholas Sze Date: Tue, 24 Nov 2015 14:34:51 -0800 Subject: [PATCH] HDFS-9434. Recommission a datanode with 500k blocks may pause NN for 30 seconds for printing info log messags. --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/blockmanagement/BlockManager.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 5e683e3de50..fb6df6e7258 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 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 feaf8433736..123a706877d 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,11 @@ 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."); + if (LOG.isTraceEnabled()) { + LOG.trace("BLOCK* processOverReplicatedBlock: Postponing " + block + + " since storage " + storage + + " does not yet have up-to-date information."); + } postponeBlock(block); return; }