Enable --cluster-mode on redisbench-admin run subcommands (#10)

* [add] Added support for cluster-mode on ftsb

Author: filipecosta90

redisbench_admin/run/args.py

@@ -1,3 +1,4 @@
+
 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")
@@ -16,5 +17,6 @@ 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('--output-file-prefix', type=str, default="", help='prefix to quickly tag some files')
     return parser

redisbench_admin/run/ftsb_redisearch/ftsb_redisearch.py

@@ -32,8 +32,8 @@ def get_run_options():
     return options
 
 
-def run_ftsb_redisearch(redis_url, ftsb_redisearch_path, setup_run_json_output_fullpath, options, input_file,
-                        workers=1,pipeline=1,args=[]):
+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=[] ):
     ##################
     # Setup commands #
     ##################
@@ -43,6 +43,9 @@ 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 oss_cluster_mode:
+        ftsb_args += ["--cluster-mode"]
+
     ftsb_process = subprocess.Popen(args=ftsb_args, **options)
     if ftsb_process.poll() is not None:
         print('Error while issuing setup commands. FTSB process is not alive. Exiting..')

redisbench_admin/run/run.py

@@ -26,6 +26,8 @@ def run_command_logic(args):
     local_path = os.path.abspath(args.local_dir)
     workers = args.workers
     pipeline = args.pipeline
+    oss_cluster_mode = args.cluster_mode
+
     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,
@@ -122,10 +124,14 @@ def run_command_logic(args):
                 setup_run_key = "setup-run-{}.json".format(repetition)
                 setup_run_json_output_fullpath = "{}/{}".format(local_path, setup_run_key)
                 input_file = run_stages_inputs["setup"]
-                benchmark_output_dict["setup"][setup_run_key] = run_ftsb_redisearch(args.redis_url,
-                                                                                    benchmark_tool_path,
+                benchmark_output_dict["setup"][setup_run_key] = run_ftsb_redisearch(args.redis_url, benchmark_tool_path,
                                                                                     setup_run_json_output_fullpath,
+<<<<<<< HEAD
+                                                                                    options, input_file, workers,
+                                                                                    pipeline, oss_cluster_mode)
+=======
                                                                                     options, input_file, workers, pipeline)
+>>>>>>> master
             progress.update()
 
         ######################
@@ -135,10 +141,14 @@ def run_command_logic(args):
         benchmark_run_json_output_fullpath = "{}/{}".format(local_path, benchmark_run_key)
         input_file = run_stages_inputs["benchmark"]
 
-        benchmark_output_dict["benchmark"][benchmark_run_key] = run_ftsb_redisearch(args.redis_url,
-                                                                                    benchmark_tool_path,
+        benchmark_output_dict["benchmark"][benchmark_run_key] = run_ftsb_redisearch(args.redis_url, benchmark_tool_path,
                                                                                     benchmark_run_json_output_fullpath,
+<<<<<<< HEAD
+                                                                                    options, input_file, workers,
+                                                                                    pipeline, oss_cluster_mode)
+=======
                                                                                     options, input_file, workers, pipeline)
+>>>>>>> master
 
         if benchmark_repetitions_require_teardown is True or repetition == args.repetitions:
             print("Running tear down steps...")