Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HDFS-9434. Recommission a datanode with 500k blocks may pause NN for 30 seconds for printing info log messags." 

This reverts commit 09dbb11566.
This commit is contained in:
Tsz-Wo Nicholas Sze 2015-11-24 14:08:45 -08:00
parent 5074d836b0
commit 83fcbd49a7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -23,9 +23,6 @@ Release 2.6.3 - UNRELEASED
HDFS-9289. Make DataStreamer#block thread safe and verify genStamp in HDFS-9289. Make DataStreamer#block thread safe and verify genStamp in
commitBlock. (Chang Li via zhz) 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 Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -2853,9 +2853,11 @@ public class BlockManager {
for(DatanodeStorageInfo storage : blocksMap.getStorages(block, State.NORMAL)) { for(DatanodeStorageInfo storage : blocksMap.getStorages(block, State.NORMAL)) {
final DatanodeDescriptor cur = storage.getDatanodeDescriptor(); final DatanodeDescriptor cur = storage.getDatanodeDescriptor();
if (storage.areBlockContentsStale()) { if (storage.areBlockContentsStale()) {
LOG.trace("BLOCK* processOverReplicatedBlock: Postponing {}" LOG.info("BLOCK* processOverReplicatedBlock: " +
+ " since storage {} does not yet have up-to-date information.", "Postponing processing of over-replicated " +
block, storage); block + " since storage + " + storage
+ "datanode " + cur + " does not yet have up-to-date " +
"block information.");
postponeBlock(block); postponeBlock(block);
return; return;
} }