[incubator-ratis] branch master updated: RATIS-1267. Fix ratis examples after supporting streaming (#377). Contributed by Hui Fei

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new ae7ba94  RATIS-1267. Fix ratis examples after supporting streaming 
(#377).  Contributed by Hui Fei
ae7ba94 is described below

commit ae7ba946538102d40cf0cb784cef22b414959a9f
Author: Hui Fei <fer...@apache.org>
AuthorDate: Mon Dec 28 17:43:22 2020 +0800

    RATIS-1267. Fix ratis examples after supporting streaming (#377).  
Contributed by Hui Fei
---
 ratis-examples/README.md                                         | 2 +-
 .../java/org/apache/ratis/examples/common/SubCommandBase.java    | 8 ++++++--
 .../java/org/apache/ratis/examples/filestore/cli/Client.java     | 4 ++--
 .../java/org/apache/ratis/examples/filestore/cli/LoadGen.java    | 2 +-
 .../java/org/apache/ratis/examples/filestore/cli/Server.java     | 9 ++++++---
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ratis-examples/README.md b/ratis-examples/README.md
index bc4ea71..7ac8256 100644
--- a/ratis-examples/README.md
+++ b/ratis-examples/README.md
@@ -63,7 +63,7 @@ where
 
 Continue the server command example,
 
-    ${BIN}/client.sh filestore loadgen --size 1048576 --numFiles 1000 --peers 
${PEERS}
+    ${BIN}/client.sh filestore loadgen --size 1048576 --numFiles 1000 
--storage /tmp/ratis/loadgen --peers ${PEERS}
 
 ## Example 2: Arithmetic
 
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/common/SubCommandBase.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/common/SubCommandBase.java
index 2cf3520..a3263e7 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/common/SubCommandBase.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/common/SubCommandBase.java
@@ -43,8 +43,12 @@ public abstract class SubCommandBase {
   public static RaftPeer[] parsePeers(String peers) {
     return Stream.of(peers.split(",")).map(address -> {
       String[] addressParts = address.split(":");
-      return 
RaftPeer.newBuilder().setId(addressParts[0]).setAddress(addressParts[1] + ":" + 
addressParts[2])
-          .setDataStreamAddress(addressParts[1] + ":" + 
addressParts[3]).build();
+      RaftPeer.Builder builder = RaftPeer.newBuilder();
+      builder.setId(addressParts[0]).setAddress(addressParts[1] + ":" + 
addressParts[2]);
+      if (addressParts.length == 4) {
+        builder.setDataStreamAddress(addressParts[1] + ":" + 
addressParts[3]).build();
+      }
+      return builder.build();
     }).toArray(RaftPeer[]::new);
   }
 
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
index 814236b..5fd90fc 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Client.java
@@ -59,8 +59,8 @@ public abstract class Client extends SubCommandBase {
   private long fileSizeInBytes;
 
   @Parameter(names = {"--bufferSize"}, description = "Size of buffer in bytes, 
should less than 4MB, " +
-      "i.e BUFFER_BYTE_LIMIT_DEFAULT", required = true)
-  private int bufferSizeInBytes;
+      "i.e BUFFER_BYTE_LIMIT_DEFAULT", required = false)
+  private int bufferSizeInBytes = 1024;
 
   @Parameter(names = {"--numFiles"}, description = "Number of files to be 
written", required = true)
   private int numFiles;
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/LoadGen.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/LoadGen.java
index 77cec3a..faa0487 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/LoadGen.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/LoadGen.java
@@ -43,7 +43,7 @@ import java.util.concurrent.Executors;
 @Parameters(commandDescription = "Load Generator for FileStore")
 public class LoadGen extends Client {
 
-  @Parameter(names = {"--sync"}, description = "Whether sync every 
bufferSize", required = true)
+  @Parameter(names = {"--sync"}, description = "Whether sync every 
bufferSize", required = false)
   private int sync = 0;
 
   @Override
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Server.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Server.java
index c8f4f23..7fc928d 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Server.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/filestore/cli/Server.java
@@ -84,9 +84,12 @@ public class Server extends SubCommandBase {
 
     final int port = 
NetUtils.createSocketAddr(getPeer(peerId).getAddress()).getPort();
     GrpcConfigKeys.Server.setPort(properties, port);
-    final int dataStreamport = 
NetUtils.createSocketAddr(getPeer(peerId).getDataStreamAddress()).getPort();
-    NettyConfigKeys.DataStream.setPort(properties, dataStreamport);
-    RaftConfigKeys.DataStream.setType(properties, 
SupportedDataStreamType.NETTY);
+    String dataStreamAddress = getPeer(peerId).getDataStreamAddress();
+    if (dataStreamAddress != null) {
+      final int dataStreamport = 
NetUtils.createSocketAddr(dataStreamAddress).getPort();
+      NettyConfigKeys.DataStream.setPort(properties, dataStreamport);
+      RaftConfigKeys.DataStream.setType(properties, 
SupportedDataStreamType.NETTY);
+    }
     properties.setInt(GrpcConfigKeys.OutputStream.RETRY_TIMES_KEY, 
Integer.MAX_VALUE);
     RaftServerConfigKeys.setStorageDir(properties, storageDir);
     RaftServerConfigKeys.Write.setElementLimit(properties, 40960);