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 63862cee3b70..01c55af2dd23 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 @@ -80,4 +80,7 @@ public interface SCMMXBean extends ServiceRuntimeInfo { */ String getPrimordialNode(); + String getRatisLogDirectory(); + + String getRocksDbDirectory(); } 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 4440d4a67da1..5b4c910f95c3 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 @@ -69,6 +69,7 @@ import org.apache.hadoop.hdds.security.x509.certificate.authority.PKIProfiles.DefaultProfile; import org.apache.hadoop.hdds.security.x509.certificate.client.SCMCertificateClient; import org.apache.hadoop.hdds.security.x509.certificate.utils.CertificateCodec; +import org.apache.hadoop.hdds.server.ServerUtils; import org.apache.hadoop.hdds.server.events.EventExecutor; import org.apache.hadoop.hdds.server.events.FixedThreadPoolWithAffinityExecutor; import org.apache.hadoop.hdds.server.http.RatisDropwizardExports; @@ -2024,4 +2025,15 @@ public String getPrimordialNode() { } return null; } + + @Override + public String getRatisLogDirectory() { + return SCMHAUtils.getSCMRatisDirectory(configuration); + } + + @Override + public String getRocksDbDirectory() { + return String.valueOf(ServerUtils.getScmDbDir(configuration)); + } + } diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html index deaf37ad5e41..ee5ac006bd4b 100644 --- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html +++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html @@ -74,6 +74,20 @@

Status

+

Meta-Data Volume Information

+ + + + + + + + + + + +
Ratis Directory{{$ctrl.overview.jmx.RatisLogDirectory}}
RocksDB Directory{{$ctrl.overview.jmx.RocksDbDirectory}}
+

Safemode rules statuses

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 84e71e0470d0..f378a8a07590 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 @@ -28,4 +28,9 @@ public interface OMMXBean extends ServiceRuntimeInfo { String getRpcPort(); + + String getRatisLogDirectory(); + + String getRocksDbDirectory(); + } 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 0e27ac05653b..e930d774e757 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 @@ -2960,6 +2960,16 @@ public String getRpcPort() { return "" + omRpcAddress.getPort(); } + @Override + public String getRatisLogDirectory() { + return OzoneManagerRatisUtils.getOMRatisDirectory(configuration); + } + + @Override + public String getRocksDbDirectory() { + return String.valueOf(OMStorage.getOmDbDir(configuration)); + } + @VisibleForTesting public OzoneManagerHttpServer getHttpServer() { return httpServer; diff --git a/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html b/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html index 4f52e413b2fd..66bcfd8bf5a3 100644 --- a/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html +++ b/hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html @@ -24,3 +24,17 @@

Status

+ +

Meta-Data Volume Information

+ + + + + + + + + + + +
Ratis Log directory{{$ctrl.overview.jmx.RatisLogDirectory}}
RocksDB Directory{{$ctrl.overview.jmx.RocksDbDirectory}}
\ No newline at end of file