[GitHub] [incubator-ratis] runzhiwang commented on a change in pull request #225: RATIS-1099. DataStreamServerRpc should connect other peers automatically

[GitBox <gi...@apache.org>]

runzhiwang commented on a change in pull request #225:
URL: https://github.com/apache/incubator-ratis/pull/225#discussion_r508254245



##########
File path: ratis-netty/src/main/java/org/apache/ratis/netty/server/NettyServerStreamRpc.java
##########
@@ -121,29 +146,30 @@ private void sendReply(DataStreamRequestByteBuf request, ChannelHandlerContext c
   private ChannelInboundHandler getServerHandler(){
     return new ChannelInboundHandlerAdapter(){
       @Override
-      public void channelRead(ChannelHandlerContext ctx, Object msg) {
+      public void channelRead(ChannelHandlerContext ctx, Object msg) throws IOException {
         final DataStreamRequestByteBuf request = (DataStreamRequestByteBuf)msg;
         final ByteBuf buf = request.slice();
         final boolean isHeader = request.getStreamOffset() == -1;
 
-        CompletableFuture<?>[] parallelWrites = new CompletableFuture<?>[clients.size() + 1];
+        CompletableFuture<?>[] parallelWrites = new CompletableFuture<?>[peers.size() + 1];
 
         final CompletableFuture<?> localWrites = isHeader?
                 streams.computeIfAbsent(request.getStreamId(), id -> getDataStreamFuture(buf))
                 : streams.get(request.getStreamId()).thenApply(stream -> writeTo(buf, stream));
         parallelWrites[0] = localWrites;
-        peersStreamOutput.putIfAbsent(request.getStreamId(), getDataStreamOutput());
 
           // do not need to forward header request
         if (isHeader) {
-          for (int i = 0; i < peersStreamOutput.get(request.getStreamId()).size(); i++) {
-            parallelWrites[i + 1] = peersStreamOutput.get(request.getStreamId()).get(i).getHeaderFuture();
+          final List<DataStreamOutput> outs = getDataStreamOutput();
+          peersStreamOutput.put(request.getStreamId(), outs);
+          for (int i = 0; i < outs.size(); i++) {
+            parallelWrites[i + 1] = outs.get(i).getHeaderFuture();
           }
         } else {
           // body
-          for (int i = 0; i < clients.size(); i++) {
-            parallelWrites[i + 1]  =
-              peersStreamOutput.get(request.getStreamId()).get(i).writeAsync(request.slice().nioBuffer());
+          final List<DataStreamOutput> outs = peersStreamOutput.get(request.getStreamId());
+          for (int i = 0; i < peers.size(); i++) {

Review comment:
       How about peers.size() -> outs.size() ?




----------------------------------------------------------------
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:
users@infra.apache.org