|
| 1 | +From adc337817824ba29e7eb669c13730acdbb0b9630 Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Wed, 10 Sep 2025 14:36:20 +0200 |
| 4 | +Subject: Allow-overriding-datanode-registration-addresses |
| 5 | + |
| 6 | +--- |
| 7 | + .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 9 +++ |
| 8 | + .../blockmanagement/DatanodeManager.java | 43 +++++++----- |
| 9 | + .../hadoop/hdfs/server/datanode/DNConf.java | 70 +++++++++++++++++++ |
| 10 | + .../hadoop/hdfs/server/datanode/DataNode.java | 35 ++++++++-- |
| 11 | + 4 files changed, 135 insertions(+), 22 deletions(-) |
| 12 | + |
| 13 | +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java |
| 14 | +index f92a2ad565..25bcd438c7 100755 |
| 15 | +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java |
| 16 | ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java |
| 17 | +@@ -152,6 +152,13 @@ public class DFSConfigKeys extends CommonConfigurationKeys { |
| 18 | + public static final boolean DFS_DATANODE_DROP_CACHE_BEHIND_READS_DEFAULT = false; |
| 19 | + public static final String DFS_DATANODE_USE_DN_HOSTNAME = "dfs.datanode.use.datanode.hostname"; |
| 20 | + public static final boolean DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT = false; |
| 21 | ++ |
| 22 | ++ public static final String DFS_DATANODE_REGISTERED_HOSTNAME = "dfs.datanode.registered.hostname"; |
| 23 | ++ public static final String DFS_DATANODE_REGISTERED_DATA_PORT = "dfs.datanode.registered.port"; |
| 24 | ++ public static final String DFS_DATANODE_REGISTERED_HTTP_PORT = "dfs.datanode.registered.http.port"; |
| 25 | ++ public static final String DFS_DATANODE_REGISTERED_HTTPS_PORT = "dfs.datanode.registered.https.port"; |
| 26 | ++ public static final String DFS_DATANODE_REGISTERED_IPC_PORT = "dfs.datanode.registered.ipc.port"; |
| 27 | ++ |
| 28 | + public static final String DFS_DATANODE_MAX_LOCKED_MEMORY_KEY = "dfs.datanode.max.locked.memory"; |
| 29 | + public static final long DFS_DATANODE_MAX_LOCKED_MEMORY_DEFAULT = 0; |
| 30 | + public static final String DFS_DATANODE_FSDATASETCACHE_MAX_THREADS_PER_VOLUME_KEY = "dfs.datanode.fsdatasetcache.max.threads.per.volume"; |
| 31 | +@@ -491,6 +498,8 @@ public class DFSConfigKeys extends CommonConfigurationKeys { |
| 32 | + public static final long DFS_DATANODE_PROCESS_COMMANDS_THRESHOLD_DEFAULT = |
| 33 | + TimeUnit.SECONDS.toMillis(2); |
| 34 | + |
| 35 | ++ public static final String DFS_NAMENODE_DATANODE_REGISTRATION_UNSAFE_ALLOW_ADDRESS_OVERRIDE_KEY = "dfs.namenode.datanode.registration.unsafe.allow-address-override"; |
| 36 | ++ public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_UNSAFE_ALLOW_ADDRESS_OVERRIDE_DEFAULT = false; |
| 37 | + public static final String DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_KEY = "dfs.namenode.datanode.registration.ip-hostname-check"; |
| 38 | + public static final boolean DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT = true; |
| 39 | + |
| 40 | +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java |
| 41 | +index ebd2fa992e..c56f254478 100644 |
| 42 | +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java |
| 43 | ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java |
| 44 | +@@ -181,6 +181,8 @@ public class DatanodeManager { |
| 45 | + private boolean hasClusterEverBeenMultiRack = false; |
| 46 | + |
| 47 | + private final boolean checkIpHostnameInRegistration; |
| 48 | ++ private final boolean allowRegistrationAddressOverride; |
| 49 | ++ |
| 50 | + /** |
| 51 | + * Whether we should tell datanodes what to cache in replies to |
| 52 | + * heartbeat messages. |
| 53 | +@@ -314,6 +316,11 @@ public class DatanodeManager { |
| 54 | + // Block invalidate limit also has some dependency on heartbeat interval. |
| 55 | + // Check setBlockInvalidateLimit(). |
| 56 | + setBlockInvalidateLimit(configuredBlockInvalidateLimit); |
| 57 | ++ this.allowRegistrationAddressOverride = conf.getBoolean( |
| 58 | ++ DFSConfigKeys.DFS_NAMENODE_DATANODE_REGISTRATION_UNSAFE_ALLOW_ADDRESS_OVERRIDE_KEY, |
| 59 | ++ DFSConfigKeys.DFS_NAMENODE_DATANODE_REGISTRATION_UNSAFE_ALLOW_ADDRESS_OVERRIDE_DEFAULT); |
| 60 | ++ LOG.info(DFSConfigKeys.DFS_NAMENODE_DATANODE_REGISTRATION_UNSAFE_ALLOW_ADDRESS_OVERRIDE_KEY |
| 61 | ++ + "=" + allowRegistrationAddressOverride); |
| 62 | + this.checkIpHostnameInRegistration = conf.getBoolean( |
| 63 | + DFSConfigKeys.DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_KEY, |
| 64 | + DFSConfigKeys.DFS_NAMENODE_DATANODE_REGISTRATION_IP_HOSTNAME_CHECK_DEFAULT); |
| 65 | +@@ -1158,27 +1165,29 @@ public class DatanodeManager { |
| 66 | + */ |
| 67 | + public void registerDatanode(DatanodeRegistration nodeReg) |
| 68 | + throws DisallowedDatanodeException, UnresolvedTopologyException { |
| 69 | +- InetAddress dnAddress = Server.getRemoteIp(); |
| 70 | +- if (dnAddress != null) { |
| 71 | +- // Mostly called inside an RPC, update ip and peer hostname |
| 72 | +- String hostname = dnAddress.getHostName(); |
| 73 | +- String ip = dnAddress.getHostAddress(); |
| 74 | +- if (checkIpHostnameInRegistration && !isNameResolved(dnAddress)) { |
| 75 | +- // Reject registration of unresolved datanode to prevent performance |
| 76 | +- // impact of repetitive DNS lookups later. |
| 77 | +- final String message = "hostname cannot be resolved (ip=" |
| 78 | +- + ip + ", hostname=" + hostname + ")"; |
| 79 | +- LOG.warn("Unresolved datanode registration: " + message); |
| 80 | +- throw new DisallowedDatanodeException(nodeReg, message); |
| 81 | ++ if (!allowRegistrationAddressOverride) { |
| 82 | ++ InetAddress dnAddress = Server.getRemoteIp(); |
| 83 | ++ if (dnAddress != null) { |
| 84 | ++ // Mostly called inside an RPC, update ip and peer hostname |
| 85 | ++ String hostname = dnAddress.getHostName(); |
| 86 | ++ String ip = dnAddress.getHostAddress(); |
| 87 | ++ if (checkIpHostnameInRegistration && !isNameResolved(dnAddress)) { |
| 88 | ++ // Reject registration of unresolved datanode to prevent performance |
| 89 | ++ // impact of repetitive DNS lookups later. |
| 90 | ++ final String message = "hostname cannot be resolved (ip=" |
| 91 | ++ + ip + ", hostname=" + hostname + ")"; |
| 92 | ++ LOG.warn("Unresolved datanode registration: " + message); |
| 93 | ++ throw new DisallowedDatanodeException(nodeReg, message); |
| 94 | ++ } |
| 95 | ++ // update node registration with the ip and hostname from rpc request |
| 96 | ++ nodeReg.setIpAddr(ip); |
| 97 | ++ nodeReg.setPeerHostName(hostname); |
| 98 | + } |
| 99 | +- // update node registration with the ip and hostname from rpc request |
| 100 | +- nodeReg.setIpAddr(ip); |
| 101 | +- nodeReg.setPeerHostName(hostname); |
| 102 | + } |
| 103 | +- |
| 104 | ++ |
| 105 | + try { |
| 106 | + nodeReg.setExportedKeys(blockManager.getBlockKeys()); |
| 107 | +- |
| 108 | ++ |
| 109 | + // Checks if the node is not on the hosts list. If it is not, then |
| 110 | + // it will be disallowed from registering. |
| 111 | + if (!hostConfigManager.isIncluded(nodeReg)) { |
| 112 | +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java |
| 113 | +index 21b92db307..5d3437239c 100644 |
| 114 | +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java |
| 115 | ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DNConf.java |
| 116 | +@@ -101,6 +101,11 @@ public class DNConf { |
| 117 | + final boolean syncOnClose; |
| 118 | + final boolean encryptDataTransfer; |
| 119 | + final boolean connectToDnViaHostname; |
| 120 | ++ private final String registeredHostname; |
| 121 | ++ private final int registeredDataPort; |
| 122 | ++ private final int registeredHttpPort; |
| 123 | ++ private final int registeredHttpsPort; |
| 124 | ++ private final int registeredIpcPort; |
| 125 | + final boolean overwriteDownstreamDerivedQOP; |
| 126 | + private final boolean pmemCacheRecoveryEnabled; |
| 127 | + |
| 128 | +@@ -189,6 +194,11 @@ public class DNConf { |
| 129 | + connectToDnViaHostname = getConf().getBoolean( |
| 130 | + DFSConfigKeys.DFS_DATANODE_USE_DN_HOSTNAME, |
| 131 | + DFSConfigKeys.DFS_DATANODE_USE_DN_HOSTNAME_DEFAULT); |
| 132 | ++ registeredHostname = getConf().get(DFSConfigKeys.DFS_DATANODE_REGISTERED_HOSTNAME); |
| 133 | ++ registeredDataPort = getConf().getInt(DFSConfigKeys.DFS_DATANODE_REGISTERED_DATA_PORT, -1); |
| 134 | ++ registeredHttpPort = getConf().getInt(DFSConfigKeys.DFS_DATANODE_REGISTERED_HTTP_PORT, -1); |
| 135 | ++ registeredHttpsPort = getConf().getInt(DFSConfigKeys.DFS_DATANODE_REGISTERED_HTTPS_PORT, -1); |
| 136 | ++ registeredIpcPort = getConf().getInt(DFSConfigKeys.DFS_DATANODE_REGISTERED_IPC_PORT, -1); |
| 137 | + this.blockReportInterval = getConf().getLong( |
| 138 | + DFS_BLOCKREPORT_INTERVAL_MSEC_KEY, |
| 139 | + DFS_BLOCKREPORT_INTERVAL_MSEC_DEFAULT); |
| 140 | +@@ -363,6 +373,66 @@ public class DNConf { |
| 141 | + return connectToDnViaHostname; |
| 142 | + } |
| 143 | + |
| 144 | ++ /** |
| 145 | ++ * Returns a hostname to register with the cluster instead of the system |
| 146 | ++ * hostname. |
| 147 | ++ * This is an expert setting and can be used in multihoming scenarios to |
| 148 | ++ * override the detected hostname. |
| 149 | ++ * |
| 150 | ++ * @return null if the system hostname should be used, otherwise a hostname |
| 151 | ++ */ |
| 152 | ++ public String getRegisteredHostname() { |
| 153 | ++ return registeredHostname; |
| 154 | ++ } |
| 155 | ++ |
| 156 | ++ /** |
| 157 | ++ * Returns a port number to register with the cluster instead of the |
| 158 | ++ * data port that the node is listening on. |
| 159 | ++ * This is an expert setting and can be used in multihoming scenarios to |
| 160 | ++ * override the detected port. |
| 161 | ++ * |
| 162 | ++ * @return -1 if the actual port should be used, otherwise a port number |
| 163 | ++ */ |
| 164 | ++ public int getRegisteredDataPort() { |
| 165 | ++ return registeredDataPort; |
| 166 | ++ } |
| 167 | ++ |
| 168 | ++ /** |
| 169 | ++ * Returns a port number to register with the cluster instead of the |
| 170 | ++ * HTTP port that the node is listening on. |
| 171 | ++ * This is an expert setting and can be used in multihoming scenarios to |
| 172 | ++ * override the detected port. |
| 173 | ++ * |
| 174 | ++ * @return -1 if the actual port should be used, otherwise a port number |
| 175 | ++ */ |
| 176 | ++ public int getRegisteredHttpPort() { |
| 177 | ++ return registeredHttpPort; |
| 178 | ++ } |
| 179 | ++ |
| 180 | ++ /** |
| 181 | ++ * Returns a port number to register with the cluster instead of the |
| 182 | ++ * HTTPS port that the node is listening on. |
| 183 | ++ * This is an expert setting and can be used in multihoming scenarios to |
| 184 | ++ * override the detected port. |
| 185 | ++ * |
| 186 | ++ * @return -1 if the actual port should be used, otherwise a port number |
| 187 | ++ */ |
| 188 | ++ public int getRegisteredHttpsPort() { |
| 189 | ++ return registeredHttpsPort; |
| 190 | ++ } |
| 191 | ++ |
| 192 | ++ /** |
| 193 | ++ * Returns a port number to register with the cluster instead of the |
| 194 | ++ * IPC port that the node is listening on. |
| 195 | ++ * This is an expert setting and can be used in multihoming scenarios to |
| 196 | ++ * override the detected port. |
| 197 | ++ * |
| 198 | ++ * @return -1 if the actual port should be used, otherwise a port number |
| 199 | ++ */ |
| 200 | ++ public int getRegisteredIpcPort() { |
| 201 | ++ return registeredIpcPort; |
| 202 | ++ } |
| 203 | ++ |
| 204 | + /** |
| 205 | + * Returns socket timeout |
| 206 | + * |
| 207 | +diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java |
| 208 | +index 956f5bbe51..22ae127d98 100644 |
| 209 | +--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java |
| 210 | ++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java |
| 211 | +@@ -135,6 +135,7 @@ import java.util.HashSet; |
| 212 | + import java.util.Iterator; |
| 213 | + import java.util.List; |
| 214 | + import java.util.Map; |
| 215 | ++import java.util.Optional; |
| 216 | + import java.util.Map.Entry; |
| 217 | + import java.util.Set; |
| 218 | + import java.util.UUID; |
| 219 | +@@ -2076,11 +2077,35 @@ public class DataNode extends ReconfigurableBase |
| 220 | + NodeType.DATA_NODE); |
| 221 | + } |
| 222 | + |
| 223 | +- DatanodeID dnId = new DatanodeID( |
| 224 | +- streamingAddr.getAddress().getHostAddress(), hostName, |
| 225 | +- storage.getDatanodeUuid(), getXferPort(), getInfoPort(), |
| 226 | +- infoSecurePort, getIpcPort()); |
| 227 | +- return new DatanodeRegistration(dnId, storageInfo, |
| 228 | ++ String registeredHostname = Optional |
| 229 | ++ .ofNullable(dnConf.getRegisteredHostname()) |
| 230 | ++ .orElseGet(() -> streamingAddr.getAddress().getHostAddress()); |
| 231 | ++ int registeredDataPort = dnConf.getRegisteredDataPort(); |
| 232 | ++ if (registeredDataPort == -1) { |
| 233 | ++ registeredDataPort = getXferPort(); |
| 234 | ++ } |
| 235 | ++ int registeredHttpPort = dnConf.getRegisteredHttpPort(); |
| 236 | ++ if (registeredHttpPort == -1) { |
| 237 | ++ registeredHttpPort = getInfoPort(); |
| 238 | ++ } |
| 239 | ++ int registeredHttpsPort = dnConf.getRegisteredHttpsPort(); |
| 240 | ++ if (registeredHttpsPort == -1) { |
| 241 | ++ registeredHttpsPort = getInfoSecurePort(); |
| 242 | ++ } |
| 243 | ++ int registeredIpcPort = dnConf.getRegisteredIpcPort(); |
| 244 | ++ if (registeredIpcPort == -1) { |
| 245 | ++ registeredIpcPort = getIpcPort(); |
| 246 | ++ } |
| 247 | ++ |
| 248 | ++ DatanodeID dnId = new DatanodeID(registeredHostname, |
| 249 | ++ registeredHostname, |
| 250 | ++ storage.getDatanodeUuid(), |
| 251 | ++ registeredDataPort, |
| 252 | ++ registeredHttpPort, |
| 253 | ++ registeredHttpsPort, |
| 254 | ++ registeredIpcPort); |
| 255 | ++ |
| 256 | ++ return new DatanodeRegistration(dnId, storageInfo, |
| 257 | + new ExportedBlockKeys(), VersionInfo.getVersion()); |
| 258 | + } |
| 259 | + |
0 commit comments