Added support for max-rps on ftsb_redisearch (#15)

* [add] Added support for max-rps on ftsb_redisearch

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.18"
+version = "0.1.19"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/args.py

@@ -1,4 +1,3 @@
-
 def create_run_arguments(parser):
     parser.add_argument('--benchmark-config-file', type=str, required=True,
                         help="benchmark config file to read instructions from. can be a local file or a remote link")
@@ -17,6 +16,8 @@ def create_run_arguments(parser):
                         help='number of database shards used in the deployment')
     parser.add_argument('--pipeline', type=int, default=1,
                         help='pipeline requests to Redis')
-    parser.add_argument('--cluster-mode',default=False, action='store_true',help="Run client in cluster mode")
+    parser.add_argument('--cluster-mode', default=False, action='store_true', help="Run client in cluster mode")
+    parser.add_argument('--max-rps', type=int, default=0,
+                        help="enable limiting the rate of queries per second, 0 = no limit. " + "By default no limit is specified and the binaries will stress the DB up to the maximum.")
     parser.add_argument('--output-file-prefix', type=str, default="", help='prefix to quickly tag some files')
     return parser

redisbench_admin/run/ftsb_redisearch/ftsb_redisearch.py

@@ -33,7 +33,7 @@ def get_run_options():
 
 
 def run_ftsb_redisearch(redis_url, ftsb_redisearch_path, setup_run_json_output_fullpath, options, input_file, workers=1,
-                        pipeline=1, oss_cluster_mode=False, args=[] ):
+                        pipeline=1, oss_cluster_mode=False, max_rps=0, args=[] ):
     ##################
     # Setup commands #
     ##################
@@ -43,6 +43,8 @@ def run_ftsb_redisearch(redis_url, ftsb_redisearch_path, setup_run_json_output_f
                   "--input={}".format(input_file), "--workers={}".format(workers),
                   "--pipeline={}".format(pipeline),
                   "--json-out-file={}".format(setup_run_json_output_fullpath)]
+    if max_rps > 0:
+        ftsb_args += ["--max-rps", max_rps]
     if oss_cluster_mode:
         ftsb_args += ["--cluster-mode"]
 

redisbench_admin/run/run.py

@@ -28,6 +28,7 @@ def run_command_logic(args):
     workers = args.workers
     pipeline = args.pipeline
     oss_cluster_mode = args.cluster_mode
+    max_rps = args.max_rps
 
     benchmark_machine_info = cpuinfo.get_cpu_info()
     total_cores = benchmark_machine_info['count']
@@ -128,7 +129,7 @@ def run_command_logic(args):
                 benchmark_output_dict["setup"][setup_run_key] = run_ftsb_redisearch(args.redis_url, benchmark_tool_path,
                                                                                     setup_run_json_output_fullpath,
                                                                                     options, input_file, workers,
-                                                                                    pipeline, oss_cluster_mode)
+                                                                                    pipeline, oss_cluster_mode, max_rps)
             progress.update()
 
         ######################
@@ -141,7 +142,7 @@ def run_command_logic(args):
         benchmark_output_dict["benchmark"][benchmark_run_key] = run_ftsb_redisearch(args.redis_url, benchmark_tool_path,
                                                                                     benchmark_run_json_output_fullpath,
                                                                                     options, input_file, workers,
-                                                                                    pipeline, oss_cluster_mode)
+                                                                                    pipeline, oss_cluster_mode, max_rps)
 
         if benchmark_repetitions_require_teardown is True or repetition == args.repetitions:
             print("Running tear down steps...")