Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -562,4 +562,21 @@ static String getPassword(ConfigurationSource conf, String alias) {
}
return password;
}

/**
* Utility string formatter method to display SCM roles.
*
* @param nodes
* @return
*/
public static String format(List<String> nodes) {
StringBuilder sb = new StringBuilder();
for (String node : nodes) {
String[] x = node.split(":");
sb.append(String
.format("{ HostName : %s, Ratis Port : %s, Role : %s } ", x[0], x[1],
x[2]));
}
return sb.toString();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

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

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

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

String getClusterId();

String getScmRatisRoles() throws IOException;

/**
* Primordial node is the node on which scm init operation is performed.
* @return hostname of primordialNode
*/
String getPrimordialNode();

}
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@
import java.net.InetSocketAddress;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -1708,4 +1709,33 @@ ContainerTokenSecretManager getContainerTokenSecretManager() {
return containerTokenMgr;
}

@Override
public String getScmRatisRoles() throws IOException {
return HddsUtils.format(getScmHAManager().getRatisServer().getRatisRoles());
}

/**
* @return hostname of primordialNode
*/
@Override
public String getPrimordialNode() {
if (SCMHAUtils.isSCMHAEnabled(configuration)) {
String primordialNode = SCMHAUtils.getPrimordialSCM(configuration);
// primordialNode can be nodeId too . If it is then return hostname.
if (SCMHAUtils.getSCMNodeIds(configuration).contains(primordialNode)) {
List<SCMNodeDetails> localAndPeerNodes =
new ArrayList<>(scmHANodeDetails.getPeerNodeDetails());
localAndPeerNodes.add(getSCMHANodeDetails().getLocalNodeDetails());
for (SCMNodeDetails nodes : localAndPeerNodes) {
if (nodes.getNodeId().equals(primordialNode)) {
return nodes.getHostName();
}
}

}
return primordialNode;
}
return null;
}

}
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 ng-hide="!$ctrl.overview.jmx.PrimordialNode">
<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
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