Skip to content

HDDS-5241. SCM UI should have leader/follower and Primordial SCM information #2260

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
bharatviswa504 merged 7 commits into from
May 26, 2021
Merged

HDDS-5241. SCM UI should have leader/follower and Primordial SCM information #2260

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c95cae4
HDDS-5241.SCM UI should have leader/follower and Primordial SCM infor…
May 18, 2021
c09abb7
trigger new CI check
May 18, 2021
383f026
addressed review comments
May 19, 2021
1876341
addressed review comments
May 19, 2021
f027eda
addressed review comments
May 20, 2021
cc24943
trigger new CI check
May 21, 2021
8cc3895
add javadoc
May 21, 2021
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
7 changes: 7 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 @@ -18,6 +18,8 @@

package org.apache.hadoop.hdds.scm.server;

import java.io.IOException;
import java.util.List;
import java.util.Map;

import org.apache.hadoop.hdds.annotation.InterfaceAudience;
Expand Down Expand Up @@ -70,4 +72,9 @@ public interface SCMMXBean extends ServiceRuntimeInfo {
String getScmId();

String getClusterId();

List<String> getScmRatisRoles() throws IOException;

String getPrimordialNode();
Comment thread
sadanand48 marked this conversation as resolved.

}
13 changes: 13 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 @@ -1708,4 +1708,17 @@ ContainerTokenSecretManager getContainerTokenSecretManager() {
return containerTokenMgr;
}

@Override
public List<String> getScmRatisRoles() throws IOException {
return getScmHAManager().getRatisServer().getRatisRoles();
Comment thread
sadanand48 marked this conversation as resolved.
Outdated
}

@Override
public String getPrimordialNode() {
if (SCMHAUtils.isSCMHAEnabled(configuration)) {
return SCMHAUtils.getPrimordialSCM(configuration);
}
return null;
Comment thread
sadanand48 marked this conversation as resolved.
}

}
8 changes: 8 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 @@ -62,6 +62,14 @@ <h2>Status</h2>
<td>Node Manager: Safe mode status</td>
<td>{{$ctrl.overview.jmx.InSafeMode}}</td>
</tr>
<tr>
<td> SCM Roles (HA) </td>
<td>{{$ctrl.overview.jmx.ScmRatisRoles}}</td>
</tr>
<tr>
<td> Primordial Node (HA) </td>
<td>{{$ctrl.overview.jmx.PrimordialNode}}</td>
</tr>
</tbody>
</table>

Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.datanode.pipeline.limit=1
OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
OZONE-SITE.XML_ozone.scm.primordial.node.id=scm1

OZONE_CONF_DIR=/etc/hadoop
OZONE_LOG_DIR=/var/log/hadoop
Expand Down