[bookkeeper] branch master updated: add V2 protocal and warmupMessages support for benchMark (#3856)

[mmerli]

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

mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a488150e9 add V2 protocal and warmupMessages support for benchMark 
(#3856)
3a488150e9 is described below

commit 3a488150e939b2980bbe2169a6c83f4f570d5e6a
Author: Hang Chen <chenh...@apache.org>
AuthorDate: Sat Mar 11 00:30:04 2023 +0800

    add V2 protocal and warmupMessages support for benchMark (#3856)
---
 .../apache/bookkeeper/benchmark/BenchThroughputLatency.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
 
b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
index 84573eec7c..83ebe4229c 100644
--- 
a/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
+++ 
b/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
@@ -257,6 +257,8 @@ public class BenchThroughputLatency implements AddCallback, 
Runnable {
         options.addOption("skipwarmup", false, "Skip warm up, default false");
         options.addOption("sendlimit", true, "Max number of entries to send. 
Default 20000000");
         options.addOption("latencyFile", true, "File to dump latencies. 
Default is latencyDump.dat");
+        options.addOption("useV2", false, "Whether use V2 protocol to send 
requests to the bookie server");
+        options.addOption("warmupMessages", true, "Number of messages to warm 
up. Default 10000");
         options.addOption("help", false, "This message");
 
         CommandLineParser parser = new PosixParser();
@@ -281,6 +283,7 @@ public class BenchThroughputLatency implements AddCallback, 
Runnable {
         }
         int throttle = Integer.parseInt(cmd.getOptionValue("throttle", 
"10000"));
         int sendLimit = Integer.parseInt(cmd.getOptionValue("sendlimit", 
"20000000"));
+        int warmupMessages = 
Integer.parseInt(cmd.getOptionValue("warmupMessages", "10000"));
 
         final int sockTimeout = 
Integer.parseInt(cmd.getOptionValue("sockettimeout", "5"));
 
@@ -321,11 +324,15 @@ public class BenchThroughputLatency implements 
AddCallback, Runnable {
         ClientConfiguration conf = new ClientConfiguration();
         
conf.setThrottleValue(throttle).setReadTimeout(sockTimeout).setZkServers(servers);
 
+        if (cmd.hasOption("useV2")) {
+            conf.setUseV2WireProtocol(true);
+        }
+
         if (!cmd.hasOption("skipwarmup")) {
             long throughput;
             LOG.info("Starting warmup");
 
-            throughput = warmUp(data, ledgers, ensemble, quorum, passwd, conf);
+            throughput = warmUp(data, ledgers, ensemble, quorum, passwd, 
warmupMessages, conf);
             LOG.info("Warmup tp: " + throughput);
             LOG.info("Warmup phase finished");
         }
@@ -438,7 +445,7 @@ public class BenchThroughputLatency implements AddCallback, 
Runnable {
      * <p>TODO: update benchmark to use metadata service uri {@link 
https://github.com/apache/bookkeeper/issues/1331}
      */
     private static long warmUp(byte[] data, int ledgers, int ensemble, int 
qSize,
-                               byte[] passwd, ClientConfiguration conf)
+                               byte[] passwd, int warmupMessages, 
ClientConfiguration conf)
             throws KeeperException, IOException, InterruptedException, 
BKException {
         final CountDownLatch connectLatch = new CountDownLatch(1);
         final int bookies;
@@ -465,7 +472,7 @@ public class BenchThroughputLatency implements AddCallback, 
Runnable {
         }
 
         BenchThroughputLatency warmup = new BenchThroughputLatency(bookies, 
bookies, bookies, passwd,
-                                                                   ledgers, 
10000, conf);
+                                                                   ledgers, 
warmupMessages, conf);
         warmup.setEntryData(data);
         Thread thread = new Thread(warmup);
         thread.start();