This is an automated email from the ASF dual-hosted git repository.
ivandika 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 e433b371d32 HDDS-14664. Remove unused OmUtils.getOmAddressForClients
(#9791)
e433b371d32 is described below
commit e433b371d327c2f66dcbd2ef9ac48d2bebc57ebd
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat Feb 21 10:22:59 2026 +0100
HDDS-14664. Remove unused OmUtils.getOmAddressForClients (#9791)
---
.../main/java/org/apache/hadoop/ozone/OmUtils.java | 22 ----------------------
.../ozone/om/TestOzoneManagerRestInterface.java | 16 +++++++---------
2 files changed, 7 insertions(+), 31 deletions(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index 7e98b1279c0..af89cd2ddb0 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -173,28 +173,6 @@ public static String getOmRpcAddress(ConfigurationSource
conf,
}
}
- /**
- * Retrieve the socket address that should be used by clients to connect
- * to OM.
- * @param conf
- * @return Target InetSocketAddress for the OM service endpoint.
- */
- public static InetSocketAddress getOmAddressForClients(
- ConfigurationSource conf) {
- final Optional<String> host = getHostNameFromConfigKeys(conf,
- OZONE_OM_ADDRESS_KEY);
-
- if (!host.isPresent()) {
- throw new IllegalArgumentException(
- OZONE_OM_ADDRESS_KEY + " must be defined. See" +
- " https://wiki.apache.org/hadoop/Ozone#Configuration for" +
- " details on configuring Ozone.");
- }
-
- return NetUtils.createSocketAddr(
- host.get() + ":" + getOmRpcPort(conf));
- }
-
/**
* Returns true if OZONE_OM_SERVICE_IDS_KEY is defined and not empty.
* @param conf Configuration
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
index 973a5b1482c..1c238f4ba39 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerRestInterface.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.om;
import static org.apache.hadoop.hdds.HddsUtils.getScmAddressForClients;
-import static org.apache.hadoop.ozone.OmUtils.getOmAddressForClients;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -26,12 +25,14 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import java.net.InetSocketAddress;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.helpers.ServiceInfo;
import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServicePort;
import org.apache.http.HttpResponse;
@@ -80,19 +81,16 @@ public void testGetServiceList() throws Exception {
serviceMap.put(serviceInfo.getNodeType(), serviceInfo);
}
- InetSocketAddress omAddress =
- getOmAddressForClients(conf);
+ String omAddress = OmUtils.getOmRpcAddress(conf);
ServiceInfo omInfo = serviceMap.get(HddsProtos.NodeType.OM);
- assertEquals(omAddress.getHostName(), omInfo.getHostname());
- assertEquals(omAddress.getPort(),
- omInfo.getPort(ServicePort.Type.RPC));
+ assertEquals(omAddress, omInfo.getHostname() + ":" +
omInfo.getPort(ServicePort.Type.RPC));
assertEquals(server.getHttpAddress().getPort(),
omInfo.getPort(ServicePort.Type.HTTP));
- assertTrue(getScmAddressForClients(conf).iterator().hasNext());
- InetSocketAddress scmAddress =
- getScmAddressForClients(conf).iterator().next();
+ Iterator<InetSocketAddress> scmAddressIterator =
getScmAddressForClients(conf).iterator();
+ assertTrue(scmAddressIterator.hasNext());
+ InetSocketAddress scmAddress = scmAddressIterator.next();
ServiceInfo scmInfo = serviceMap.get(HddsProtos.NodeType.SCM);
assertEquals(scmAddress.getHostName(), scmInfo.getHostname());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
