瀏覽代碼

HDFS-14853. Addendum: NPE in DFSNetworkTopology#chooseRandomWithStorageType() when the excludedNode is not present. Contributed by Ranith Sardar.

Ayush Saxena 5 年之前
父節點
當前提交
66e60942e9

+ 2 - 1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java

@@ -378,7 +378,8 @@ public class TestDFSNetworkTopology {
     HashSet<Node> excluded = new HashSet<>();
     HashSet<Node> excluded = new HashSet<>();
 
 
     excluded.add(new DatanodeInfoBuilder()
     excluded.add(new DatanodeInfoBuilder()
-        .setNodeID(DatanodeID.EMPTY_DATANODE_ID).build());
+        .setNodeID(new DatanodeID("null",
+            "null", "null", 0, 0, 0, 0)).build());
     Node node = CLUSTER.chooseRandomWithStorageType("/", "/l1/d1/r1", excluded,
     Node node = CLUSTER.chooseRandomWithStorageType("/", "/l1/d1/r1", excluded,
         StorageType.ARCHIVE);
         StorageType.ARCHIVE);