Skip to content

HDDS-6840. Add MetaData volume information to the SCM and OM - UI #3488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jojochuang merged 5 commits into from
Jun 15, 2022
Merged

HDDS-6840. Add MetaData volume information to the SCM and OM - UI #3488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cecd1e
HDDS-6840. Adding more information to the OM and SCM UI-Page.
Jun 7, 2022
90b6833
Fixed styling issues
Jun 7, 2022
02e3ba8
Changed names of the getter methods
Jun 8, 2022
26e8713
Removed features that will be added in a separate JIRA
Jun 9, 2022
818aece
Removed features that will be added in a separate JIRA
Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,7 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
*/
String getPrimordialNode();

String getRatisLogDirectory();

String getRocksDbDirectory();
}
12 changes: 12 additions & 0 deletions ...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}

}
14 changes: 14 additions & 0 deletions hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,20 @@ <h2>Status</h2>
</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">
Expand Down
5 changes: 5 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMXBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,9 @@
public interface OMMXBean extends ServiceRuntimeInfo {

String getRpcPort();

String getRatisLogDirectory();

String getRocksDbDirectory();

}
10 changes: 10 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 14 additions & 0 deletions hadoop-ozone/ozone-manager/src/main/resources/webapps/ozoneManager/om-overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,17 @@ <h2>Status</h2>
</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>