HDDS-11794. Display HostName in OM / SCM Overview. (apache#7482)

adoroszlai · Dec 4, 2024 · 65df308 · 65df308
1 parent 0bde3a2
commit 65df308
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
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
@@ -84,4 +84,11 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
   String getRatisLogDirectory();
 
   String getRocksDbDirectory();
+
+  /**
+   * Gets the SCM hostname.
+   *
+   * @return the SCM hostname for the datanode.
+   */
+  String getHostname();
 }
diff --git a/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -332,6 +332,8 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
   private Clock systemClock;
   private DNSToSwitchMapping dnsToSwitchMapping;
 
+  private String scmHostName;
+
   /**
    * Creates a new StorageContainerManager. Configuration will be
    * updated with information on the actual listening addresses used
@@ -456,6 +458,7 @@ private StorageContainerManager(OzoneConfiguration conf,
 
     // Emit initial safe mode status, as now handlers are registered.
     scmSafeModeManager.emitSafeModeStatus();
+    scmHostName = HddsUtils.getHostName(conf);
 
     registerMXBean();
     registerMetricsSource(this);
@@ -2223,6 +2226,11 @@ public String getRocksDbDirectory() {
     return String.valueOf(ServerUtils.getScmDbDir(configuration));
   }
 
+  @Override
+  public String getHostname() {
+    return scmHostName;
+  }
+
   public Collection<String> getScmAdminUsernames() {
     return scmAdmins.getAdminUsernames();
   }

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
@@ -36,4 +36,10 @@ public interface OMMXBean extends ServiceRuntimeInfo {
 
   String getRocksDbDirectory();
 
+  /**
+   * Gets the OM hostname.
+   *
+   * @return the OM hostname for the datanode.
+   */
+  String getHostname();
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -475,6 +475,8 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
 
   private boolean fsSnapshotEnabled;
 
+  private String omHostName;
+
   /**
    * OM Startup mode.
    */
@@ -733,6 +735,7 @@ private OzoneManager(OzoneConfiguration conf, StartupOption startupOption)
     }
 
     bucketUtilizationMetrics = BucketUtilizationMetrics.create(metadataManager);
+    omHostName = HddsUtils.getHostName(conf);
   }
 
   public boolean isStopped() {
@@ -3136,6 +3139,11 @@ public String getRocksDbDirectory() {
     return String.valueOf(OMStorage.getOmDbDir(configuration));
   }
 
+  @Override
+  public String getHostname() {
+    return omHostName;
+  }
+
   @VisibleForTesting
   public OzoneManagerHttpServer getHttpServer() {
     return httpServer;