HDDS-4146. Show the ScmId and ClusterId in the scm web ui. (apache#1350)

rakeshadr · Sep 3, 2020 · d9d56f9 · d9d56f9
1 parent 5ea4994
commit d9d56f9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
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
@@ -66,4 +66,8 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
   Map<String, Integer> getContainerStateCount();
 
   Map<String, String> getRuleStatusMetrics();
+
+  String getScmId();
+
+  String getClusterId();
 }
diff --git a/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/...s/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -1141,4 +1141,12 @@ public Map<String, String> getRuleStatusMetrics() {
   public PipelineChoosePolicy getPipelineChoosePolicy() {
     return this.pipelineChoosePolicy;
   }
+
+  public String getScmId() {
+    return getScmStorageConfig().getScmId();
+  }
+
+  public String getClusterId() {
+    return getScmStorageConfig().getClusterID();
+  }
 }
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
@@ -14,6 +14,20 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
+<h2>SCM Information</h2>
+<table class="table table-bordered table-striped">
+    <tbody>
+    <tr>
+        <td>Scm Id:</td>
+        <td>{{$ctrl.overview.jmx.ScmId}}</td>
+    </tr>
+    <tr>
+        <td>Cluster Id:</td>
+        <td>{{$ctrl.overview.jmx.ClusterId}}</td>
+    </tr>
+    </tbody>
+</table>
+
 <h2>Node counts</h2>
 
 <table class="table table-bordered table-striped" class="col-md-6">