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 65df3080e3 HDDS-11794. Display HostName in OM / SCM Overview. (#7482)
65df3080e3 is described below
commit 65df3080e31a4dd9eb9181de89926d76dd814735
Author: slfan1989 <[email protected]>
AuthorDate: Wed Dec 4 09:28:13 2024 +0800
HDDS-11794. Display HostName in OM / SCM Overview. (#7482)
---
.../main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java | 7 +++++++
.../apache/hadoop/hdds/scm/server/StorageContainerManager.java | 8 ++++++++
.../src/main/java/org/apache/hadoop/ozone/om/OMMXBean.java | 6 ++++++
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 8 ++++++++
4 files changed, 29 insertions(+)
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 75a5193116..f54ec30985 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 5895ecc12b..9da0c686c3 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 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
// Emit initial safe mode status, as now handlers are registered.
scmSafeModeManager.emitSafeModeStatus();
+ scmHostName = HddsUtils.getHostName(conf);
registerMXBean();
registerMetricsSource(this);
@@ -2223,6 +2226,11 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
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
index 54e81f8825..1ba4f3d1d1 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 137377d9d8..2ccc16cc28 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 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
bucketUtilizationMetrics =
BucketUtilizationMetrics.create(metadataManager);
+ omHostName = HddsUtils.getHostName(conf);
}
public boolean isStopped() {
@@ -3136,6 +3139,11 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
return String.valueOf(OMStorage.getOmDbDir(configuration));
}
+ @Override
+ public String getHostname() {
+ return omHostName;
+ }
+
@VisibleForTesting
public OzoneManagerHttpServer getHttpServer() {
return httpServer;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
