This is an automated email from the ASF dual-hosted git repository.
xyao 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 02289ce HDDS-4146. Show the ScmId and ClusterId in the scm web ui.
(#1350)
02289ce is described below
commit 02289ce491e0c6b0724509e2e92f4a3112e42c4d
Author: maobaolong <[email protected]>
AuthorDate: Fri Aug 28 07:49:34 2020 +0800
HDDS-4146. Show the ScmId and ClusterId in the scm web ui. (#1350)
---
.../java/org/apache/hadoop/hdds/scm/server/SCMMXBean.java | 4 ++++
.../hadoop/hdds/scm/server/StorageContainerManager.java | 8 ++++++++
.../src/main/resources/webapps/scm/scm-overview.html | 14 ++++++++++++++
3 files changed, 26 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 f0a497a..f10a544 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
@@ -66,4 +66,8 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
Map<String, Integer> getContainerStateCount();
Map<String, String> getRuleStatusMetrics();
+
+ String getScmId();
+
+ String getClusterId();
}
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 352e34a..3cf12e7 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
@@ -1141,4 +1141,12 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
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
index efed59d..4e900bb 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
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
