bharatviswa504 commented on a change in pull request #2155:
URL: https://github.com/apache/ozone/pull/2155#discussion_r616367260
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMSnapshotProvider.java
##########
@@ -103,18 +101,19 @@ public DBCheckpoint getSCMDBSnapshot(String
leaderSCMNodeID)
.getAbsolutePath();
File targetFile = new File(snapshotFilePath + ".tar.gz");
- // the client instance will be initialized only when first install snapshot
- // notification from ratis leader will be received.
- if (client == null) {
- client = new InterSCMGrpcClient(
- peerNodesMap.get(leaderSCMNodeID).getInetAddress().getHostAddress(),
- conf);
- }
+ // the downloadClient instance will be craeted as and when install snapshot
Review comment:
Minor: craeted -> created
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/InterSCMGrpcClient.java
##########
@@ -52,13 +52,15 @@
private final InterSCMProtocolServiceGrpc.InterSCMProtocolServiceStub
client;
- private final long timeout;
-
- public InterSCMGrpcClient(final String host, final ConfigurationSource conf)
{
- Preconditions.checkNotNull(conf);
- int port = conf.getInt(ScmConfigKeys.OZONE_SCM_GRPC_PORT_KEY,
- ScmConfigKeys.OZONE_SCM_GRPC_PORT_DEFAULT);
- timeout =
+ public InterSCMGrpcClient(final String host, final int leaderPort,
+ final ConfigurationSource conf) {
+ // if the leader grpc port details are not setup in the peer Map,
+ // fall back to default grpc port.
+ final int port = leaderPort == 0 ?
Review comment:
Do we need this, because grpcPort is set in SCMNodeDetails during build?
##########
File path:
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
##########
@@ -184,11 +186,20 @@ public void
notifyNotLeader(Collection<TransactionContext> pendingEntries) {
@Override
public CompletableFuture<TermIndex> notifyInstallSnapshotFromLeader(
RaftProtos.RoleInfoProto roleInfoProto, TermIndex firstTermIndexInLog) {
-
- String leaderNodeId = RaftPeerId.valueOf(roleInfoProto.getFollowerInfo()
- .getLeaderInfo().getId().getId()).toString();
+ if (!roleInfoProto.getFollowerInfo().hasLeaderInfo()) {
+ return JavaUtils.completeExceptionally(new IOException("Failed " +
+ "notifyInstallSnapshotFromLeader due to missing leader info"));
+ }
+ String leaderAddress = roleInfoProto.getFollowerInfo()
+ .getLeaderInfo().getId().getAddress();
+ Optional<SCMNodeDetails> leaderDetails =
+ scm.getSCMHANodeDetails().getPeerNodeDetails().stream().filter(
+ p -> p.getRatisHostPortStr().equals(leaderAddress))
+ .findFirst();
+ Preconditions.checkNotNull(leaderDetails);
Review comment:
Minor: Here we need to check for checkState(leaderDetails.isPresent())
As findFirst returns Optional.empty for empty stream.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
