From 66e60942e9e20520e2696c4b9439518235eb2b3a Mon Sep 17 00:00:00 2001
From: Ayush Saxena <ayushsaxena@apache.org>
Date: Sat, 28 Sep 2019 09:14:50 +0530
Subject: [PATCH] HDFS-14853. Addendum: NPE in
 DFSNetworkTopology#chooseRandomWithStorageType() when the excludedNode is not
 present. Contributed by Ranith Sardar.

---
 .../org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java
index fdb41a206cd..d987f8502b3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/net/TestDFSNetworkTopology.java
@@ -378,7 +378,8 @@ public void testChooseRandomWithStorageTypeWithExcludedforNullCheck()
     HashSet<Node> excluded = new HashSet<>();
 
     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,
         StorageType.ARCHIVE);