From 73b423a9c1e350cca8193abc8e9f4d5b56bd99b0 Mon Sep 17 00:00:00 2001 From: Sreeja Chintalapati Date: Mon, 5 Jan 2026 11:35:46 +0530 Subject: [PATCH 1/2] HDDS-14249. Add ozone.scm.names fallback for SCM client addresses --- .../java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java index 53bc67b1fe91..80bd172fedbe 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java @@ -129,15 +129,18 @@ public static List buildNodeInfo(ConfigurationSource conf) { String scmBlockClientAddress = getHostNameFromConfigKeys(conf, OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY, - OZONE_SCM_CLIENT_ADDRESS_KEY).orElse(null); + OZONE_SCM_CLIENT_ADDRESS_KEY, + OZONE_SCM_NAMES).orElse(null); String scmClientAddress = getHostNameFromConfigKeys(conf, - OZONE_SCM_CLIENT_ADDRESS_KEY).orElse(null); + OZONE_SCM_CLIENT_ADDRESS_KEY, + OZONE_SCM_NAMES).orElse(null); String scmSecurityClientAddress = getHostNameFromConfigKeys(conf, OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY, - OZONE_SCM_CLIENT_ADDRESS_KEY).orElse(null); + OZONE_SCM_CLIENT_ADDRESS_KEY, + OZONE_SCM_NAMES).orElse(null); String scmDatanodeAddress = getHostNameFromConfigKeys(conf, From 35235f0b0aca20daa87b527241dc055f6209279a Mon Sep 17 00:00:00 2001 From: Sreeja Chintalapati Date: Thu, 15 Jan 2026 16:38:36 +0530 Subject: [PATCH 2/2] Refactor to reuse scmClientAddress as fallback --- .../hadoop/hdds/scm/ha/SCMNodeInfo.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java index 80bd172fedbe..dc2393fe4a99 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java @@ -127,25 +127,18 @@ public static List buildNodeInfo(ConfigurationSource conf) { // Following current approach of fall back to // OZONE_SCM_CLIENT_ADDRESS_KEY to figure out hostname. - String scmBlockClientAddress = getHostNameFromConfigKeys(conf, - OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY, - OZONE_SCM_CLIENT_ADDRESS_KEY, - OZONE_SCM_NAMES).orElse(null); - String scmClientAddress = getHostNameFromConfigKeys(conf, OZONE_SCM_CLIENT_ADDRESS_KEY, OZONE_SCM_NAMES).orElse(null); + + String scmBlockClientAddress = getHostNameFromConfigKeys(conf, + OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY).orElse(scmClientAddress); - String scmSecurityClientAddress = - getHostNameFromConfigKeys(conf, - OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY, - OZONE_SCM_CLIENT_ADDRESS_KEY, - OZONE_SCM_NAMES).orElse(null); + String scmSecurityClientAddress = getHostNameFromConfigKeys(conf, + OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY).orElse(scmClientAddress); - String scmDatanodeAddress = - getHostNameFromConfigKeys(conf, - OZONE_SCM_DATANODE_ADDRESS_KEY, - OZONE_SCM_CLIENT_ADDRESS_KEY, OZONE_SCM_NAMES).orElse(null); + String scmDatanodeAddress = getHostNameFromConfigKeys(conf, + OZONE_SCM_DATANODE_ADDRESS_KEY).orElse(scmClientAddress); int scmBlockClientPort = getPortNumberFromConfigKeys(conf, OZONE_SCM_BLOCK_CLIENT_ADDRESS_KEY)