This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6007f86fc04 HDDS-14249. Add ozone.scm.names fallback for SCM client
addresses (#9591)
6007f86fc04 is described below
commit 6007f86fc048f3ee6c19756662cf3f034e2aed37
Author: sreejasahithi <[email protected]>
AuthorDate: Thu Jan 15 22:06:16 2026 +0530
HDDS-14249. Add ozone.scm.names fallback for SCM client addresses (#9591)
---
.../org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 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 53bc67b1fe9..dc2393fe4a9 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,22 +127,18 @@ public static List<SCMNodeInfo>
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).orElse(null);
-
String scmClientAddress = getHostNameFromConfigKeys(conf,
- OZONE_SCM_CLIENT_ADDRESS_KEY).orElse(null);
+ 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).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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
