|
| 1 | +From cb5487dcd3e6e170014604478a3d8cef03285007 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Jim Halfpenny <jim.halfpenny@stackable.tech> |
| 3 | +Date: Mon, 16 Mar 2026 09:18:46 +0000 |
| 4 | +Subject: HDFS-17891 fix for hostname resolution bug with datanodes |
| 5 | + |
| 6 | +--- |
| 7 | + .../hadoop/hdfs/server/blockmanagement/HostSet.java | 11 +++++++++-- |
| 8 | + 1 file changed, 9 insertions(+), 2 deletions(-) |
| 9 | + |
| 10 | +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java |
| 11 | +index d12e5fbae1..3da753f1cb 100644 |
| 12 | +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java |
| 13 | ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/HostSet.java |
| 14 | +@@ -18,10 +18,11 @@ |
| 15 | + package org.apache.hadoop.hdfs.server.blockmanagement; |
| 16 | + |
| 17 | + |
| 18 | +-import org.apache.hadoop.util.Preconditions; |
| 19 | + import org.apache.hadoop.thirdparty.com.google.common.collect.HashMultimap; |
| 20 | + import org.apache.hadoop.thirdparty.com.google.common.collect.Multimap; |
| 21 | + import org.apache.hadoop.thirdparty.com.google.common.collect.UnmodifiableIterator; |
| 22 | ++import org.slf4j.Logger; |
| 23 | ++import org.slf4j.LoggerFactory; |
| 24 | + |
| 25 | + import java.net.InetAddress; |
| 26 | + import java.net.InetSocketAddress; |
| 27 | +@@ -38,6 +39,8 @@ |
| 28 | + * .getPort() || B.getPort() == 0. |
| 29 | + */ |
| 30 | + public class HostSet implements Iterable<InetSocketAddress> { |
| 31 | ++ private static final Logger LOG = LoggerFactory.getLogger(HostSet.class); |
| 32 | ++ |
| 33 | + // Host -> lists of ports |
| 34 | + private final Multimap<InetAddress, Integer> addrs = HashMultimap.create(); |
| 35 | + |
| 36 | +@@ -72,7 +75,11 @@ int size() { |
| 37 | + } |
| 38 | + |
| 39 | + void add(InetSocketAddress addr) { |
| 40 | +- Preconditions.checkArgument(!addr.isUnresolved()); |
| 41 | ++ LOG.debug("Adding address to HostSet: {}", addr); |
| 42 | ++ if (addr.isUnresolved()) { |
| 43 | ++ LOG.warn("Unresolved address not added to HostSet: {}", addr); |
| 44 | ++ return; |
| 45 | ++ } |
| 46 | + addrs.put(addr.getAddress(), addr.getPort()); |
| 47 | + } |
| 48 | + |
0 commit comments