Explorar el Código

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

This reverts commit 09dbb11566410f2e9101555637ad81c7acc7edfd.
Tsz-Wo Nicholas Sze hace 9 años
padre
commit
83fcbd49a7

+ 0 - 3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -23,9 +23,6 @@ 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

+ 5 - 3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java

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