This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 67e526111e HDDS-11563. Display OM/SCM service ID as Namespace in web
UI (#7321)
67e526111e is described below
commit 67e526111e9517f20a1784454317cb0f52055ff2
Author: Conway Zhang <[email protected]>
AuthorDate: Tue Nov 5 18:34:22 2024 +0800
HDDS-11563. Display OM/SCM service ID as Namespace in web UI (#7321)
---
.../main/java/org/apache/hadoop/ozone/HddsDatanodeService.java | 10 ++++++++--
.../java/org/apache/hadoop/hdds/server/ServiceRuntimeInfo.java | 9 +++++++++
.../src/main/resources/webapps/static/templates/overview.html | 4 ++++
.../apache/hadoop/hdds/scm/server/StorageContainerManager.java | 4 ++++
.../src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 5 +++++
5 files changed, 30 insertions(+), 2 deletions(-)
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
index 5f45f954fa..55aeb466e7 100644
---
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
@@ -40,6 +40,7 @@ import org.apache.hadoop.hdds.conf.ReconfigurationHandler;
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.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;
@@ -116,8 +117,7 @@ public class HddsDatanodeService extends GenericCli
implements ServicePlugin {
private final Map<String, RatisDropwizardExports> ratisMetricsMap =
new ConcurrentHashMap<>();
private List<RatisDropwizardExports.MetricReporter> ratisReporterList = null;
- private DNMXBeanImpl serviceRuntimeInfo =
- new DNMXBeanImpl(HddsVersionInfo.HDDS_VERSION_INFO) { };
+ private DNMXBeanImpl serviceRuntimeInfo;
private ObjectName dnInfoBeanName;
private HddsDatanodeClientProtocolServer clientProtocolServer;
private OzoneAdmins admins;
@@ -210,6 +210,12 @@ public class HddsDatanodeService extends GenericCli
implements ServicePlugin {
}
public void start() {
+ serviceRuntimeInfo = new DNMXBeanImpl(HddsVersionInfo.HDDS_VERSION_INFO) {
+ @Override
+ public String getNamespace() {
+ return SCMHAUtils.getScmServiceId(conf);
+ }
+ };
serviceRuntimeInfo.setStartTime();
ratisReporterList = RatisDropwizardExports
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
index 3783613f3e..f966ef0093 100644
---
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 @@ package org.apache.hadoop.hdds.server;
*/
public interface ServiceRuntimeInfo {
+ /**
+ * Gets the namespace of Ozone.
+ *
+ * @return the namespace
+ */
+ default String getNamespace() {
+ return "";
+ };
+
/**
* Gets the version of Hadoop.
*
diff --git
a/hadoop-hdds/framework/src/main/resources/webapps/static/templates/overview.html
b/hadoop-hdds/framework/src/main/resources/webapps/static/templates/overview.html
index 30e2d26f56..7ff118b330 100644
---
a/hadoop-hdds/framework/src/main/resources/webapps/static/templates/overview.html
+++
b/hadoop-hdds/framework/src/main/resources/webapps/static/templates/overview.html
@@ -17,6 +17,10 @@
<h1>Overview</h1>
<table class="table table-bordered table-striped">
<tbody>
+ <tr ng-if="$ctrl.jmx.Namespace && $ctrl.jmx.Namespace !== ''">
+ <th>Namespace:</th>
+ <td>{{$ctrl.jmx.Namespace}}</td>
+ </tr>
<tr>
<th>Started:</th>
<td>{{$ctrl.jmx.StartedTimeInMillis | date : 'medium'}}</td>
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 ba52b7fcc5..9390318a29 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
@@ -2063,6 +2063,10 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
return statefulServiceStateManager;
}
+ @Override
+ public String getNamespace() {
+ return scmHANodeDetails.getLocalNodeDetails().getServiceId();
+ }
/**
* Get the safe mode status of all rules.
*
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 eacd38375f..2bb8c915b3 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
@@ -3057,6 +3057,11 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
}
}
+ @Override
+ public String getNamespace() {
+ return omNodeDetails.getServiceId();
+ }
+
@Override
public String getRpcPort() {
return "" + omRpcAddress.getPort();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
