sanpwc commented on a change in pull request #321:
URL: https://github.com/apache/ignite-3/pull/321#discussion_r704151164
##########
File path:
modules/raft/src/main/java/org/apache/ignite/raft/jraft/rpc/impl/RaftGroupServiceImpl.java
##########
@@ -214,88 +221,134 @@ private RaftGroupServiceImpl(
sendWithRetry(leader, req, currentTimeMillis() + timeout, fut);
return fut.thenApply(resp -> {
- peers = resp.peers();
- learners = resp.learners();
+ peers = parsePeerList(resp.peersList());
+ learners = parsePeerList(resp.learnersList());
return null;
});
}
/** {@inheritDoc} */
- @Override public CompletableFuture<Void> addPeers(List<Peer> peers) {
- Peer leader = this.leader;
+ @Override public CompletableFuture<Void> addPeer(Peer peer) {
+ Peer leader = peerFromPeerId(this.leader);
if (leader == null)
- return refreshLeader().thenCompose(res -> addPeers(peers));
+ return refreshLeader().thenCompose(res -> addPeer(peer));
- AddPeersRequest req =
factory.addPeersRequest().groupId(groupId).peers(peers).build();
+ AddPeerRequest req =
factory.addPeerRequest().groupId(groupId).peerId(PeerId.fromPeer(peer).toString()).build();
- CompletableFuture<ChangePeersResponse> fut = new CompletableFuture<>();
+ CompletableFuture<AddPeerResponse> fut = new CompletableFuture<>();
sendWithRetry(leader, req, currentTimeMillis() + timeout, fut);
return fut.thenApply(resp -> {
- this.peers = resp.newPeers();
+ this.peers = parsePeerList(resp.newPeersList());
return null;
});
}
/** {@inheritDoc} */
- @Override public CompletableFuture<Void> removePeers(List<Peer> peers) {
- Peer leader = this.leader;
+ @Override public CompletableFuture<Void> removePeer(Peer peer) {
+ Peer leader = peerFromPeerId(this.leader);
+
+ if (leader == null)
+ return refreshLeader().thenCompose(res -> removePeer(peer));
+
+ RemovePeerRequest req =
factory.removePeerRequest().groupId(groupId).peerId(PeerId.fromPeer(peer).toString()).build();
+
+ CompletableFuture<RemovePeerResponse> fut = new CompletableFuture<>();
+
+ sendWithRetry(leader, req, currentTimeMillis() + timeout, fut);
+
+ return fut.thenApply(resp -> {
+ this.peers = parsePeerList(resp.newPeersList());
+
+ return null;
+ });
+ }
+
+ @Override public CompletableFuture<Void> changePeers(List<Peer> peers) {
Review comment:
javadoc is missing.
--
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]
