HDFS-7213. processIncrementalBlockReport performance degradation.

Contributed by Eric Payne.
(cherry picked from commit e226b5b40d)

(cherry picked from commit 946463efef)
(cherry picked from commit f94aa4d25c2f96faf5164e807c2c3eb031e9a1fe)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -35,6 +35,9 @@ Release 2.6.1 - UNRELEASED
 
     HDFS-8486. DN startup may cause severe data loss. (daryn via cmccabe)
 
+    HDFS-7213. processIncrementalBlockReport performance degradation.
+    (Eric Payne via kihwal)
+
     HDFS-7235. DataNode#transferBlock should report blocks that don't exist
     using reportBadBlock (yzhang via cmccabe)
 

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

@@ -3105,9 +3105,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);
+    }
   }
 
   /**