Skip to content

HDDS-5022. SCM get roles command should provide Ratis Leader/Follower… #2094

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

Closed
ghuangups wants to merge 1 commit into from
Closed

HDDS-5022. SCM get roles command should provide Ratis Leader/Follower… #2094

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
3 changes: 2 additions & 1 deletion hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMRatisServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.ratis.server.RaftServer;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.ExecutionException;

Expand All @@ -45,7 +46,7 @@ SCMRatisResponse submitRequest(SCMRatisRequest request)
/**
* Returns roles of ratis peers.
*/
List<String> getRatisRoles();
List<String> getRatisRoles() throws UnknownHostException;

/**
* Returns NotLeaderException with useful info.
Expand Down
23 changes: 17 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 @@ -18,24 +18,29 @@
package org.apache.hadoop.hdds.scm.ha;

import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.Iterator;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.HddsUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.SCMRatisProtocol.RequestType;
import org.apache.hadoop.hdds.scm.AddSCMRequest;
import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.util.Time;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.proto.RaftProtos;
import org.apache.ratis.protocol.ClientId;
import org.apache.ratis.protocol.RaftClientReply;
import org.apache.ratis.protocol.RaftClientRequest;
Expand Down Expand Up @@ -223,12 +228,18 @@ public void stop() throws IOException {
}

@Override
public List<String> getRatisRoles() {
return division.getGroup().getPeers().stream()
.map(peer -> peer.getAddress() == null ? "" : peer.getAddress())
.collect(Collectors.toList());
public List<String> getRatisRoles() throws UnknownHostException {
Collection<RaftPeer> peers = division.getGroup().getPeers();
List<String> ratisRoles = new ArrayList<>();
for (RaftPeer peer : peers) {
InetAddress peerInetAddress = InetAddress.getByName(HddsUtils.getHostName(peer.getAddress()).get());
boolean isLocal = NetUtils.isLocalAddress(peerInetAddress);
ratisRoles.add((peer.getAddress() == null ? "" : peer.getAddress()
.concat(isLocal ? ":".concat(RaftProtos.RaftPeerRole.LEADER.toString()) :
":".concat(RaftProtos.RaftPeerRole.FOLLOWER.toString()))));
}
return ratisRoles;
}

/**
* {@inheritDoc}
*/
Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/smoketest/admincli/scmha.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ Test Timeout 5 minutes
*** Test Cases ***
Run scm roles
${output} = Execute ozone admin scm roles
Should contain ${output} [scm:9865]
Should Match Regexp ${output} [scm:9865:(LEADER|FOLLOWER)]