This is an automated email from the ASF dual-hosted git repository.
weichiu 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 45f13fd044 HDDS-6840. Add MetaData volume information to the SCM and
OM - UI (#3488)
45f13fd044 is described below
commit 45f13fd04428b52170569bd225bb16f3e7645a2c
Author: Arafat2198 <[email protected]>
AuthorDate: Wed Jun 15 12:10:22 2022 +0530
HDDS-6840. Add MetaData volume information to the SCM and OM - UI (#3488)
Co-authored-by: Mohammad Arafat Khan
<[email protected]>
---
.../java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java | 3 +++
.../hadoop/hdds/scm/server/StorageContainerManager.java | 12 ++++++++++++
.../src/main/resources/webapps/scm/scm-overview.html | 14 ++++++++++++++
.../src/main/java/org/apache/hadoop/ozone/om/OMMXBean.java | 5 +++++
.../main/java/org/apache/hadoop/ozone/om/OzoneManager.java | 10 ++++++++++
.../main/resources/webapps/ozoneManager/om-overview.html | 14 ++++++++++++++
6 files changed, 58 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 63862cee3b..01c55af2dd 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 ccd0ccfc42..3e5deb8cbe 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
@@ -72,6 +72,7 @@ import
org.apache.hadoop.hdds.security.x509.certificate.authority.PKIProfiles.De
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;
@@ -2032,4 +2033,15 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
}
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 deaf37ad5e..ee5ac006bd 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 @@
</tbody>
</table>
+<h2>Meta-Data Volume Information</h2>
+<table class="table table-bordered table-striped" class="col-md-6">
+ <tbody>
+ <tr>
+ <td>Ratis Directory</td>
+ <td>{{$ctrl.overview.jmx.RatisLogDirectory}}</td>
+ </tr>
+ <tr>
+ <td>RocksDB Directory</td>
+ <td>{{$ctrl.overview.jmx.RocksDbDirectory}}</td>
+ </tr>
+ </tbody>
+</table>
+
<h2>Safemode rules statuses</h2>
<table class="table table-bordered table-striped" class="col-md-6">
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 84e71e0470..f378a8a075 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 @@ import org.apache.hadoop.hdds.server.ServiceRuntimeInfo;
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 fd413b573c..a277c2d67b 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
@@ -2965,6 +2965,16 @@ public final class OzoneManager extends
ServiceRuntimeInfoImpl
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 4f52e413b2..66bcfd8bf5 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 @@
</tr>
</tbody>
</table>
+
+<h2>Meta-Data Volume Information</h2>
+<table class="table table-bordered table-striped" class="col-md-6">
+ <tbody>
+ <tr>
+ <td>Ratis Log directory</td>
+ <td>{{$ctrl.overview.jmx.RatisLogDirectory}}</td>
+ </tr>
+ <tr>
+ <td>RocksDB Directory</td>
+ <td>{{$ctrl.overview.jmx.RocksDbDirectory}}</td>
+ </tr>
+ </tbody>
+</table>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
