Skip to content

HDDS-6728. SCM UI not showing correct HA roles #3401

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
adoroszlai merged 2 commits into from
Jul 26, 2022
Merged

HDDS-6728. SCM UI not showing correct HA roles #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2256fb9
HDDS-6728. Refactor getRatisRoles of SCM
symious May 11, 2022
8eb1a44
HDDS-6728. Fix comments
symious Jul 26, 2022
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
18 changes: 12 additions & 6 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.apache.hadoop.hdds.scm.AddSCMRequest;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.hdds.security.x509.SecurityConfig;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.util.Time;
Expand Down Expand Up @@ -250,6 +249,7 @@ public boolean isStopped() {
@Override
public List<String> getRatisRoles() throws IOException {
Collection<RaftPeer> peers = division.getGroup().getPeers();
RaftPeer leader = getLeader();
List<String> ratisRoles = new ArrayList<>();
for (RaftPeer peer : peers) {
InetAddress peerInetAddress = null;
Expand All @@ -260,12 +260,8 @@ public List<String> getRatisRoles() throws IOException {
LOG.error("SCM Ratis PeerInetAddress {} is unresolvable",
peer.getAddress());
}
boolean isLocal = false;
if (peerInetAddress != null) {
isLocal = NetUtils.isLocalAddress(peerInetAddress);
}
ratisRoles.add((peer.getAddress() == null ? "" :
peer.getAddress().concat(isLocal ?
peer.getAddress().concat(peer.equals(leader) ?
":".concat(RaftProtos.RaftPeerRole.LEADER.toString()) :
":".concat(RaftProtos.RaftPeerRole.FOLLOWER.toString()))
.concat(":".concat(peer.getId().toString()))
Expand Down Expand Up @@ -353,4 +349,14 @@ public static RaftGroupId buildRaftGroupId(String clusterId) {
UUID.fromString(clusterId.replace(OzoneConsts.CLUSTER_ID_PREFIX, "")));
}

private RaftPeer getLeader() {
if (division.getInfo().isLeader()) {
return division.getPeer();
} else {
ByteString leaderId = division.getInfo().getRoleInfoProto()
.getFollowerInfo().getLeaderInfo().getId().getId();
return leaderId.isEmpty() ? null :
division.getRaftConf().getPeer(RaftPeerId.valueOf(leaderId));
}
}
}
14 changes: 14 additions & 0 deletions ...gration-test/src/test/java/org/apache/hadoop/ozone/scm/TestStorageContainerManagerHA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@

import java.time.Instant;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;

import org.apache.hadoop.hdds.conf.OzoneConfiguration;
Expand Down Expand Up @@ -251,4 +253,16 @@ public void testBootStrapSCM() throws Exception {
true);
Assert.assertTrue(StorageContainerManager.scmBootstrap(conf2));
}

@Test
public void testGetRatisRolesDetail() throws IOException {
Set<String> resultSet = new HashSet<>();
for (StorageContainerManager scm: cluster.getStorageContainerManagers()) {
resultSet.addAll(scm.getScmHAManager().getRatisServer().getRatisRoles());
}
System.out.println(resultSet);
Assert.assertEquals(3, resultSet.size());
Assert.assertEquals(1,
resultSet.stream().filter(x -> x.contains("LEADER")).count());
}
}