You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by si...@apache.org on 2026/10/20 22:33:07 UTC

(hadoop) branch trunk updated: HDFS-18000. Bracket IPv6 literals when building NameNode URIs and host:port strings (#8843)

This is an automated email from the ASF dual-hosted git repository.

smengcl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new d00e645f12e HDFS-18000. Bracket IPv6 literals when building NameNode URIs and host:port strings (#8843)
d00e645f12e is described below

commit d00e645f12e22f9993a84b836e15c263db223213
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Tue Oct 20 15:33:01 2026 -0700

    HDFS-18000. Bracket IPv6 literals when building NameNode URIs and host:port strings (#8843)
    
    Co-authored-by: Claude Opus 5.5 <no...@anthropic.com>
---
 .../main/java/org/apache/hadoop/hdfs/DFSUtilClient.java    | 11 +++++------
 .../org/apache/hadoop/hdfs/TestDefaultNameNodePort.java    | 12 ++++++++++++
 .../src/main/java/org/apache/hadoop/hdfs/DFSUtil.java      |  2 +-
 .../main/java/org/apache/hadoop/hdfs/tools/GetConf.java    |  3 ++-
 .../src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java  |  6 ++++++
 .../java/org/apache/hadoop/hdfs/tools/TestGetConf.java     | 14 +++++++++++++-
 6 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
index db06bbe78a3..4f9435de9c2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSUtilClient.java
@@ -918,12 +918,11 @@ public static InetSocketAddress getNNAddressCheckLogical(Configuration conf,
   }
 
   public static URI getNNUri(InetSocketAddress namenode) {
-    int port = namenode.getPort();
-    String portString =
-        (port == HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT) ?
-        "" : (":" + port);
-    return URI.create(HdfsConstants.HDFS_URI_SCHEME + "://"
-        + namenode.getHostName() + portString);
+    String authority = NetUtils.getHostPortString(namenode);
+    if (namenode.getPort() == HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT) {
+      authority = authority.substring(0, authority.lastIndexOf(':'));
+    }
+    return URI.create(HdfsConstants.HDFS_URI_SCHEME + "://" + authority);
   }
 
   public static InterruptedIOException toInterruptedIOException(String message,
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java
index adc1d9125a0..5623ea9cbd9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java
@@ -65,4 +65,16 @@ public void testGetUri() {
         DFSUtilClient.getNNUri(new InetSocketAddress("foo",
             HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)));
   }
+
+  @Test
+  public void testGetUriIPv6() {
+    // getHostName() returns an unbracketed literal when there is no PTR record.
+    String host = "2001:db8:0:0:0:0:0:10";
+    URI uri = DFSUtilClient.getNNUri(InetSocketAddress.createUnresolved(host, 555));
+    assertEquals(URI.create("hdfs://[" + host + "]:555"), uri);
+    assertEquals("[" + host + "]", uri.getHost());
+    assertEquals(URI.create("hdfs://[" + host + "]"),
+        DFSUtilClient.getNNUri(InetSocketAddress.createUnresolved(host,
+            HdfsClientConfigKeys.DFS_NAMENODE_RPC_PORT_DEFAULT)));
+  }
 }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
index 4d9c547d5e9..2c2ca539411 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
@@ -1098,7 +1098,7 @@ static String substituteForWildcardAddress(String configuredAddress,
     InetSocketAddress sockAddr = NetUtils.createSocketAddr(configuredAddress);
     final InetAddress addr = sockAddr.getAddress();
     if (addr != null && addr.isAnyLocalAddress()) {
-      return defaultHost + ":" + sockAddr.getPort();
+      return NetUtils.getHostPortString(defaultHost, sockAddr.getPort());
     } else {
       return configuredAddress;
     }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
index aaa1038fa7f..448d993cbcd 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/GetConf.java
@@ -35,6 +35,7 @@
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
 import org.apache.hadoop.hdfs.DFSUtil.ConfiguredNNAddress;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Tool;
@@ -245,7 +246,7 @@ public int doWorkInternal(GetConf tool, String []args) throws IOException {
       if (!cnnlist.isEmpty()) {
         for (ConfiguredNNAddress cnn : cnnlist) {
           InetSocketAddress rpc = cnn.getAddress();
-          tool.printOut(rpc.getHostName()+":"+rpc.getPort());
+          tool.printOut(NetUtils.getHostPortString(rpc));
         }
         return 0;
       }
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
index 8dc895dc9b8..7e588429dab 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
@@ -659,6 +659,12 @@ public void testSubstituteForWildcardAddress() throws IOException {
         DFSUtil.substituteForWildcardAddress("0.0.0.0:12345", "foo"));
     assertEquals("127.0.0.1:12345",
         DFSUtil.substituteForWildcardAddress("127.0.0.1:12345", "foo"));
+    assertEquals("[2001:db8:0:0:0:0:0:10]:12345",
+        DFSUtil.substituteForWildcardAddress("[::]:12345", "2001:db8:0:0:0:0:0:10"));
+    assertEquals("[2001:db8:0:0:0:0:0:10]:12345",
+        DFSUtil.substituteForWildcardAddress("0.0.0.0:12345", "2001:db8:0:0:0:0:0:10"));
+    assertEquals("[2001:db8::11]:12345",
+        DFSUtil.substituteForWildcardAddress("[2001:db8::11]:12345", "foo"));
   }
 
   private static Collection<URI> getInternalNameServiceUris(Configuration conf,
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
index 3703e194473..f14c0172a28 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestGetConf.java
@@ -55,6 +55,7 @@
 import org.apache.hadoop.hdfs.tools.GetConf.CommandHandler;
 import org.apache.hadoop.hdfs.util.HostsFileWriter;
 import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.SecurityUtil;
 import org.apache.hadoop.util.ToolRunner;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -219,7 +220,7 @@ private void getAddressListFromTool(TestType type, HdfsConfiguration conf,
       if (!checkPort) {
         expectedHosts[i++] = addr.getHostName();
       }else {
-        expectedHosts[i++] = addr.getHostName()+":"+addr.getPort();
+        expectedHosts[i++] = NetUtils.getHostPortString(addr);
       }
     }
 
@@ -316,6 +317,17 @@ public void testNonFederation() throws Exception {
     conf.set(DFS_NAMENODE_RPC_ADDRESS_KEY, "localhost:1001");
     verifyAddresses(conf, TestType.NAMENODE, false, "localhost:1001");
     verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "localhost:1001");
+
+    // An IPv6 literal host name is printed bracketed. use_ip=false keeps the
+    // literal as the host name, as with no PTR record, without a DNS lookup.
+    conf = new HdfsConfiguration();
+    conf.set(DFS_NAMENODE_RPC_ADDRESS_KEY, "[2001:db8::10]:1001");
+    SecurityUtil.setTokenServiceUseIp(false);
+    try {
+      verifyAddresses(conf, TestType.NNRPCADDRESSES, true, "[2001:db8::10]:1001");
+    } finally {
+      SecurityUtil.setTokenServiceUseIp(true);
+    }
   }
 
   /**


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org