Skip to content

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

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
xiaoyuyao merged 1 commit into from
Aug 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 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 @@ -66,4 +66,8 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
Map<String, Integer> getContainerStateCount();

Map<String, String> getRuleStatusMetrics();

String getScmId();

String getClusterId();
}
8 changes: 8 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 @@ -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();
}
}
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 @@ -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">
Expand Down