HDFS-11827. NPE is thrown when log level changed in BlockPlacementPol…

…icyDefault#chooseRandom() method. Contributed by xupeng.
bitmybytes · May 17, 2017 · ec21ce4 · ec21ce4
1 parent 18c494a
commit ec21ce4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java b/.../main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java
@@ -735,7 +735,7 @@ protected DatanodeStorageInfo chooseRandom(int numOfReplicas,
       }
       Preconditions.checkState(excludedNodes.add(chosenNode), "chosenNode "
           + chosenNode + " is already in excludedNodes " + excludedNodes);
-      if (LOG.isDebugEnabled()) {
+      if (LOG.isDebugEnabled() && builder != null) {
         builder.append("\nNode ").append(NodeBase.getPath(chosenNode))
             .append(" [");
       }
@@ -771,7 +771,7 @@ protected DatanodeStorageInfo chooseRandom(int numOfReplicas,
           }
         }
 
-        if (LOG.isDebugEnabled()) {
+        if (LOG.isDebugEnabled() && builder != null) {
           builder.append("\n]");
         }