浏览代码

Revert "HDFS-10620. StringBuilder created and appended even if logging is disabled. Contributed by Staffan Friberg."

This reverts commit 2685e16f381532d53aea413ce1c0a14181ee7c89.
Akira Ajisaka 9 年之前
父节点
当前提交
a04b193374

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

@@ -1195,19 +1195,16 @@ public class BlockManager implements BlockStatsMXBean {
     if (!isPopulatingReplQueues()) {
       return;
     }
-    StringBuilder datanodes = blockLog.isDebugEnabled()
-        ? new StringBuilder() : null;
+    StringBuilder datanodes = new StringBuilder();
     for (DatanodeStorageInfo storage : blocksMap.getStorages(b)) {
       if (storage.getState() != State.NORMAL) {
         continue;
       }
       final DatanodeDescriptor node = storage.getDatanodeDescriptor();
       invalidateBlocks.add(b, node, false);
-      if (datanodes != null) {
-        datanodes.append(node).append(" ");
-      }
+      datanodes.append(node).append(" ");
     }
-    if (datanodes != null & datanodes.length() != 0) {
+    if (datanodes.length() != 0) {
       blockLog.debug("BLOCK* addToInvalidates: {} {}", b, datanodes);
     }
   }