Browse Source

HDFS-8307. Spurious DNS Queries from hdfs shell. Contributed by Andres Perez

Anu Engineer 8 years ago
parent
commit
95edf265b3

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -67,6 +67,8 @@ Release 2.7.4 - UNRELEASED
     (Erik Krogen via Zhe Zhang)
 
   BUG FIXES
+   
+    HDFS-8307. Spurious DNS Queries from hdfs shell. (Andres Perez via aengineer)
 
     HDFS-9696. Garbage snapshot records linger forever. (kihwal)
 

+ 12 - 2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/NameNodeProxies.java

@@ -192,8 +192,18 @@ public class NameNodeProxies {
         dtService = SecurityUtil.buildTokenService(
             NameNode.getAddress(nameNodeUri));
       }
-      return new ProxyAndInfo<T>(proxy, dtService,
-          NameNode.getAddress(nameNodeUri));
+
+      InetSocketAddress nnAddress;
+
+      //We dont need to resolve the address if is it a Nameservice ID
+      if(HAUtil.isLogicalUri(conf, nameNodeUri)) {
+        nnAddress = InetSocketAddress.createUnresolved(
+            nameNodeUri.getHost(), NameNode.DEFAULT_PORT);
+      } else {
+        nnAddress = NameNode.getAddress(nameNodeUri);
+      }
+
+      return new ProxyAndInfo<T>(proxy, dtService, nnAddress);
     }
   }