HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value. Contributed by Kuhu Shukla.

(cherry picked from commit a7fce9ab415fcc834ca1d91f913157ffd103fa5f)

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

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

@@ -95,6 +95,10 @@ Release 2.7.3 - UNRELEASED
     HDFS-9752. Permanent write failures may happen to slow writers during
     datanode rolling upgrades (Walter Su via kihwal)
 
+    HDFS-9779 . TestReplicationPolicyWithNodeGroup NODE variable picks wrong rack value
+    (Kuhu Shukla via umamahesh)
+
+
     HDFS-9784. Example usage is not correct in Transparent Encryption document.
     (Takashi Ohnishi via aajisaka)
 

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyWithNodeGroup.java

@@ -115,7 +115,7 @@ public class TestReplicationPolicyWithNodeGroup {
   };
 
   private final static DatanodeDescriptor NODE = 
-      new DatanodeDescriptor(DFSTestUtil.getDatanodeDescriptor("9.9.9.9", "/d2/r4/n7"));
+      DFSTestUtil.getDatanodeDescriptor("9.9.9.9", "/d2/r4/n7");
   
   private static final DatanodeStorageInfo[] storagesForDependencies;
   private static final DatanodeDescriptor[]  dataNodesForDependencies;