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 index 75a5193116c6..f54ec30985bb 100644 --- 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/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java index 9390318a29ff..f814c0ba3182 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java +++ b/hadoop-hdds/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); @@ -2222,6 +2225,11 @@ public String getRocksDbDirectory() { return String.valueOf(ServerUtils.getScmDbDir(configuration)); } + @Override + public String getHostname() { + return scmHostName; + } + public Collection 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 index 54e81f8825df..1ba4f3d1d134 100644 --- 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 index 137377d9d8a6..2ccc16cc2856 100644 --- 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;