bharatviswa504 commented on a change in pull request #2173:
URL: https://github.com/apache/ozone/pull/2173#discussion_r619999781
##########
File path:
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
##########
@@ -95,21 +97,38 @@ private HddsUtils() {
*
* @return Target {@code InetSocketAddress} for the SCM client endpoint.
*/
- public static InetSocketAddress getScmAddressForClients(
+ public static Collection<InetSocketAddress> getScmAddressForClients(
ConfigurationSource conf) {
- Optional<String> host = getHostNameFromConfigKeys(conf,
- ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY);
- if (!host.isPresent()) {
- // Fallback to Ozone SCM name
- host = Optional.of(getSingleSCMAddress(conf).getHostName());
- }
+ if (SCMHAUtils.getScmServiceId(conf) != null) {
+ List<SCMNodeInfo> scmNodeInfoList = SCMNodeInfo.buildNodeInfo(conf);
+ Collection<InetSocketAddress> scmAddressList =
+ new HashSet<>(scmNodeInfoList.size());
+ for (SCMNodeInfo scmNodeInfo : scmNodeInfoList) {
+ if (scmNodeInfo.getScmClientAddress() == null) {
+ throw new ConfigurationException("Ozone scm client address is not " +
+ "set for SCM service-id " + scmNodeInfo.getServiceId() +
+ "node-id" + scmNodeInfo.getNodeId());
+ }
+ scmAddressList.add(
+ NetUtils.createSocketAddr(scmNodeInfo.getScmClientAddress()));
+ }
+ return scmAddressList;
+ } else {
+ Optional< String > host = getHostNameFromConfigKeys(conf,
+ ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY);
Review comment:
Refactored.
##########
File path:
hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
##########
@@ -95,21 +97,38 @@ private HddsUtils() {
*
* @return Target {@code InetSocketAddress} for the SCM client endpoint.
*/
- public static InetSocketAddress getScmAddressForClients(
+ public static Collection<InetSocketAddress> getScmAddressForClients(
ConfigurationSource conf) {
- Optional<String> host = getHostNameFromConfigKeys(conf,
- ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY);
- if (!host.isPresent()) {
- // Fallback to Ozone SCM name
- host = Optional.of(getSingleSCMAddress(conf).getHostName());
- }
+ if (SCMHAUtils.getScmServiceId(conf) != null) {
+ List<SCMNodeInfo> scmNodeInfoList = SCMNodeInfo.buildNodeInfo(conf);
+ Collection<InetSocketAddress> scmAddressList =
+ new HashSet<>(scmNodeInfoList.size());
+ for (SCMNodeInfo scmNodeInfo : scmNodeInfoList) {
+ if (scmNodeInfo.getScmClientAddress() == null) {
+ throw new ConfigurationException("Ozone scm client address is not " +
+ "set for SCM service-id " + scmNodeInfo.getServiceId() +
+ "node-id" + scmNodeInfo.getNodeId());
+ }
+ scmAddressList.add(
+ NetUtils.createSocketAddr(scmNodeInfo.getScmClientAddress()));
+ }
+ return scmAddressList;
+ } else {
+ Optional< String > host = getHostNameFromConfigKeys(conf,
+ ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY);
- final int port = getPortNumberFromConfigKeys(conf,
- ScmConfigKeys.OZONE_SCM_CLIENT_ADDRESS_KEY)
- .orElse(ScmConfigKeys.OZONE_SCM_CLIENT_PORT_DEFAULT);
+ if (!host.isPresent()) {
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
