HDDS-11563. Optimize code structure

apache · Oct 17, 2024 · 68e54bd · 68e54bd
1 parent 758584b
commit 68e54bd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/DNMXBean.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/DNMXBean.java
@@ -26,6 +26,4 @@
  */
 @InterfaceAudience.Private
 public interface DNMXBean extends ServiceRuntimeInfo {
-
-  String getNamespace();
 }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/DNMXBeanImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/DNMXBeanImpl.java
@@ -29,8 +29,4 @@ public DNMXBeanImpl(
       VersionInfo versionInfo) {
     super(versionInfo);
   }
-
-  public String getNamespace() {
-    return "";
-  }
 }
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java
@@ -22,7 +22,6 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,7 +40,7 @@
 import org.apache.hadoop.hdds.protocol.DatanodeDetails;
 import org.apache.hadoop.hdds.protocol.SecretKeyProtocol;
 import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolClientSideTranslatorPB;
-import org.apache.hadoop.hdds.scm.ScmConfigKeys;
+import org.apache.hadoop.hdds.scm.ha.SCMHAUtils;
 import org.apache.hadoop.hdds.security.SecurityConfig;
 import org.apache.hadoop.hdds.security.symmetric.DefaultSecretKeyClient;
 import org.apache.hadoop.hdds.security.symmetric.SecretKeyClient;
@@ -215,13 +214,7 @@ public void start() {
     serviceRuntimeInfo = new DNMXBeanImpl(HddsVersionInfo.HDDS_VERSION_INFO) {
       @Override
       public String getNamespace() {
-        String localScmServiceId = conf.getTrimmed(
-            ScmConfigKeys.OZONE_SCM_DEFAULT_SERVICE_ID);
-        if (localScmServiceId == null) {
-          Collection<String> scmServiceIds = conf.getTrimmedStringCollection(OZONE_SCM_SERVICE_IDS_KEY);
-          return String.join(",", scmServiceIds);
-        }
-        return localScmServiceId;
+        return SCMHAUtils.getScmServiceId(conf);
       }
     };
     serviceRuntimeInfo.setStartTime();

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServiceRuntimeInfo.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/ServiceRuntimeInfo.java
@@ -33,6 +33,15 @@
  */
 public interface ServiceRuntimeInfo {
 
+  /**
+   * Gets the namespace of Hadoop.
+   *
+   * @return the namespace
+   */
+  default String getNamespace() {
+    return "";
+  };
+
   /**
    * Gets the version of Hadoop.
    *

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
@@ -31,7 +31,6 @@
 @InterfaceAudience.Private
 public interface SCMMXBean extends ServiceRuntimeInfo {
 
-  String getNamespace();
   /**
    * Get the SCM RPC server port that used to listen to datanode requests.
    * @return SCM datanode RPC server port

diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMXBean.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMXBean.java
@@ -28,8 +28,6 @@
 @InterfaceAudience.Private
 public interface OMMXBean extends ServiceRuntimeInfo {
 
-  String getNamespace();
-
   String getRpcPort();
 
   List<List<String>> getRatisRoles();