Enable pipeline benchmarks on ftsb_redisearch (#9)

* [add] Enable pipeline benchmarks in ftsb_redisearch

* [ver] Version bump to 0.1.13

Author: filipecosta90

pyproject.toml

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

redisbench_admin/run/args.py

@@ -14,5 +14,7 @@ def create_run_arguments(parser):
                         help='one of docker-oss,docker-oss-cluster,docker-enterprise,oss,oss-cluster,enterprise')
     parser.add_argument('--deployment-shards', type=int, default=1,
                         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('--output-file-prefix', type=str, default="", help='prefix to quickly tag some files')
     return parser

redisbench_admin/run/ftsb_redisearch/ftsb_redisearch.py

@@ -33,14 +33,15 @@ def get_run_options():
 
 
 def run_ftsb_redisearch(redis_url, ftsb_redisearch_path, setup_run_json_output_fullpath, options, input_file,
-                        workers=1,args=[]):
+                        workers=1,pipeline=1,args=[]):
     ##################
     # Setup commands #
     ##################
     output_json = None
     ftsb_args = []
     ftsb_args += [ftsb_redisearch_path, "--host={}".format(redis_url),
                   "--input={}".format(input_file), "--workers={}".format(workers),
+                  "--pipeline={}".format(pipeline),
                   "--json-out-file={}".format(setup_run_json_output_fullpath)]
     ftsb_process = subprocess.Popen(args=ftsb_args, **options)
     if ftsb_process.poll() is not None:

redisbench_admin/run/run.py

@@ -25,6 +25,7 @@ def run_command_logic(args):
 
     local_path = os.path.abspath(args.local_dir)
     workers = args.workers
+    pipeline = args.pipeline
     benchmark_machine_info = cpuinfo.get_cpu_info()
     total_cores = benchmark_machine_info['count']
     benchmark_infra = {"total-benchmark-machines": 0, "benchmark-machines": {}, "total-db-machines": 0,
@@ -35,6 +36,10 @@ def run_command_logic(args):
     if workers == 0:
         print('Setting number of workers equal to machine VCPUs {}'.format(total_cores))
         workers = total_cores
+    else:
+        print('Setting number of workers to {}'.format(workers))
+
+    print('Setting pipeline to {}'.format(pipeline))
 
     deployment_type = args.deployment_type
     config_filename = args.benchmark_config_file
@@ -120,7 +125,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)
+                                                                                    options, input_file, workers, pipeline)
             progress.update()
 
         ######################
@@ -133,7 +138,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)
+                                                                                    options, input_file, workers, pipeline)
 
         if benchmark_repetitions_require_teardown is True or repetition == args.repetitions:
             print("Running tear down steps...")