You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by di...@apache.org on 2020/07/16 03:13:40 UTC
[hadoop-ozone] branch master updated: HDDS-3923. Display the
safemode status on scm page (#1165)
This is an automated email from the ASF dual-hosted git repository.
dineshc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 7266bf8 HDDS-3923. Display the safemode status on scm page (#1165)
7266bf8 is described below
commit 7266bf87da846241494cf3e219f1785f53f1c729
Author: maobaolong <30...@qq.com>
AuthorDate: Thu Jul 16 11:13:32 2020 +0800
HDDS-3923. Display the safemode status on scm page (#1165)
---
.../java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java | 2 ++
.../hadoop/hdds/scm/server/StorageContainerManager.java | 10 ++++++++++
.../src/main/resources/webapps/scm/scm-overview.html | 11 +++++++++++
3 files changed, 23 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 2c63875..f0a497a 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
@@ -64,4 +64,6 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
* Returns the container count in all states.
*/
Map<String, Integer> getContainerStateCount();
+
+ Map<String, String> getRuleStatusMetrics();
}
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 0ed843c..621b126 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
@@ -1122,4 +1122,14 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
public Map<String, Pair<Boolean, String>> getRuleStatus() {
return scmSafeModeManager.getRuleStatus();
}
+
+ @Override
+ public Map<String, String> getRuleStatusMetrics() {
+ Map<String, String> map = new HashMap<>();
+ for (Map.Entry<String, Pair<Boolean, String>> entry :
+ scmSafeModeManager.getRuleStatus().entrySet()) {
+ map.put(entry.getKey(), entry.getValue().getRight());
+ }
+ return map;
+ }
}
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 38ce638..ebb1170 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
@@ -42,3 +42,14 @@
</tr>
</tbody>
</table>
+
+<h2>Safemode rules statuses</h2>
+
+<table class="table table-bordered table-striped" class="col-md-6">
+ <tbody>
+ <tr ng-repeat="typestat in $ctrl.scmmetrics.RuleStatusMetrics">
+ <td>{{typestat.key}}</td>
+ <td>{{typestat.value}}</td>
+ </tr>
+ </tbody>
+</table>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org