codings-dan commented on a change in pull request #602:
URL: https://github.com/apache/ratis/pull/602#discussion_r808119398
##########
File path:
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
##########
@@ -519,22 +520,38 @@ static SetConfigurationRequestProto
toSetConfigurationRequestProto(
static TransferLeadershipRequest toTransferLeadershipRequest(
TransferLeadershipRequestProto p) {
final RaftRpcRequestProto m = p.getRpcRequest();
- final RaftPeer newLeader = ProtoUtils.toRaftPeer(p.getNewLeader());
- return new TransferLeadershipRequest(
- ClientId.valueOf(m.getRequestorId()),
- RaftPeerId.valueOf(m.getReplyId()),
- ProtoUtils.toRaftGroupId(m.getRaftGroupId()),
- p.getRpcRequest().getCallId(),
- newLeader.getId(),
- m.getTimeoutMs());
+ String address = p.getNewLeaderOrBuilder().getAddress();
+ if (!Objects.equals(address, "")) {
Review comment:
done
##########
File path:
ratis-client/src/main/java/org/apache/ratis/client/impl/ClientProtoUtils.java
##########
@@ -519,22 +520,38 @@ static SetConfigurationRequestProto
toSetConfigurationRequestProto(
static TransferLeadershipRequest toTransferLeadershipRequest(
TransferLeadershipRequestProto p) {
final RaftRpcRequestProto m = p.getRpcRequest();
- final RaftPeer newLeader = ProtoUtils.toRaftPeer(p.getNewLeader());
- return new TransferLeadershipRequest(
- ClientId.valueOf(m.getRequestorId()),
- RaftPeerId.valueOf(m.getReplyId()),
- ProtoUtils.toRaftGroupId(m.getRaftGroupId()),
- p.getRpcRequest().getCallId(),
- newLeader.getId(),
- m.getTimeoutMs());
+ String address = p.getNewLeaderOrBuilder().getAddress();
+ if (!Objects.equals(address, "")) {
+ return new TransferLeadershipRequest(
+ ClientId.valueOf(m.getRequestorId()),
+ RaftPeerId.valueOf(m.getReplyId()),
+ ProtoUtils.toRaftGroupId(m.getRaftGroupId()),
+ p.getRpcRequest().getCallId(),
+ ProtoUtils.toRaftPeer(p.getNewLeader()).getId(),
+ m.getTimeoutMs());
+ } else {
+ return new TransferLeadershipRequest(
+ ClientId.valueOf(m.getRequestorId()),
+ RaftPeerId.valueOf(m.getReplyId()),
+ ProtoUtils.toRaftGroupId(m.getRaftGroupId()),
+ p.getRpcRequest().getCallId(),
+ null,
+ m.getTimeoutMs());
+ }
}
static TransferLeadershipRequestProto toTransferLeadershipRequestProto(
TransferLeadershipRequest request) {
- return TransferLeadershipRequestProto.newBuilder()
- .setRpcRequest(toRaftRpcRequestProtoBuilder(request))
-
.setNewLeader(RaftPeer.newBuilder().setId(request.getNewLeader()).build().getRaftPeerProto())
- .build();
+ if (request.getNewLeader() != null) {
+ return TransferLeadershipRequestProto.newBuilder()
+ .setRpcRequest(toRaftRpcRequestProtoBuilder(request))
+
.setNewLeader(RaftPeer.newBuilder().setId(request.getNewLeader()).build().getRaftPeerProto())
+ .build();
+ } else {
+ return TransferLeadershipRequestProto.newBuilder()
+ .setRpcRequest(toRaftRpcRequestProtoBuilder(request))
+ .build();
+ }
Review comment:
done
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
