redisbench-admin 0.11.19__py3-none-any.whl → 0.11.21__py3-none-any.whl

redisbench_admin/compare/args.py

@@ -53,8 +53,6 @@ def create_compare_arguments(parser):
     parser.add_argument("--deployment_type", type=str, default="oss-standalone")
     parser.add_argument("--baseline_deployment_name", type=str, default="")
     parser.add_argument("--comparison_deployment_name", type=str, default="")
-    parser.add_argument("--baseline_github_org", type=str, default=GITHUB_ORG)
-    parser.add_argument("--comparison_github_org", type=str, default=GITHUB_ORG)
     parser.add_argument("--metric_name", type=str, default=None)
     parser.add_argument("--running_platform", type=str, default=None)
     parser.add_argument("--extra-filter", type=str, default=None)

redisbench_admin/compare/compare.py

@@ -166,8 +166,6 @@ def compare_command_logic(args, project_name, project_version):
     auto_approve = args.auto_approve
     running_platform = args.running_platform
     grafana_base_dashboard = args.grafana_base_dashboard
-    baseline_github_org = args.baseline_github_org
-    comparison_github_org = args.comparison_github_org
     # using an access token
     is_actionable_pr = False
     contains_regression_comment = False
@@ -193,38 +191,32 @@ def compare_command_logic(args, project_name, project_version):
         logging.info("Detected github token")
         g = Github(github_token)
         if pull_request is not None and pull_request != "":
-            try:
-                pull_request_n = int(pull_request)
-                github_pr = (
-                    g.get_user(tf_github_org)
-                    .get_repo(tf_github_repo)
-                    .get_issue(pull_request_n)
-                )
-                comments = github_pr.get_comments()
-                pr_link = github_pr.html_url
-                logging.info("Working on github PR already: {}".format(pr_link))
-                is_actionable_pr = True
-                contains_regression_comment, pos = check_regression_comment(comments)
-                if contains_regression_comment:
-                    regression_comment = comments[pos]
-                    old_regression_comment_body = regression_comment.body
-                    logging.info(
-                        "Already contains regression comment. Link: {}".format(
-                            regression_comment.html_url
-                        )
+            pull_request_n = int(pull_request)
+            github_pr = (
+                g.get_user(tf_github_org)
+                .get_repo(tf_github_repo)
+                .get_issue(pull_request_n)
+            )
+            comments = github_pr.get_comments()
+            pr_link = github_pr.html_url
+            logging.info("Working on github PR already: {}".format(pr_link))
+            is_actionable_pr = True
+            contains_regression_comment, pos = check_regression_comment(comments)
+            if contains_regression_comment:
+                regression_comment = comments[pos]
+                old_regression_comment_body = regression_comment.body
+                logging.info(
+                    "Already contains regression comment. Link: {}".format(
+                        regression_comment.html_url
                     )
-                    if verbose:
-                        logging.info("Printing old regression comment:")
-                        print("".join(["-" for x in range(1, 80)]))
-                        print(regression_comment.body)
-                        print("".join(["-" for x in range(1, 80)]))
-                else:
-                    logging.info("Does not contain regression comment")
-
-            except Exception as e:
-                logging.error(
-                    f"Error while working with github. exception {e.__str__()}"
                 )
+                if verbose:
+                    logging.info("Printing old regression comment:")
+                    print("".join(["-" for x in range(1, 80)]))
+                    print(regression_comment.body)
+                    print("".join(["-" for x in range(1, 80)]))
+            else:
+                logging.info("Does not contain regression comment")
 
     grafana_dashboards_uids = {
         "redisgraph": "SH9_rQYGz",
@@ -282,8 +274,6 @@ def compare_command_logic(args, project_name, project_version):
         to_ts_ms,
         use_metric_context_path,
         running_platform,
-        baseline_github_org,
-        comparison_github_org,
     )
     comment_body = ""
     if total_comparison_points > 0:
@@ -508,8 +498,6 @@ def compute_regression_table(
     to_ts_ms=None,
     use_metric_context_path=None,
     running_platform=None,
-    baseline_github_org="",
-    comparison_github_org="",
 ):
     START_TIME_NOW_UTC, _, _ = get_start_time_vars()
     START_TIME_LAST_MONTH_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=31)
@@ -595,8 +583,6 @@ def compute_regression_table(
         test_names,
         tf_triggering_env,
         verbose,
-        baseline_github_org,
-        comparison_github_org,
         running_platform,
     )
     logging.info(
@@ -667,7 +653,7 @@ def get_by_strings(
         comparison_str = comparison_branch
 
     if baseline_tag is not None:
-        if baseline_covered:
+        if comparison_covered:
             logging.error(
                 "--baseline-branch and --baseline-tag are mutually exclusive. Pick one..."
             )
@@ -724,8 +710,6 @@ def from_rts_to_regression_table(
     test_names,
     tf_triggering_env,
     verbose,
-    baseline_github_org="",
-    comparison_github_org="",
     running_platform=None,
 ):
     print_all = print_regressions_only is False and print_improvements_only is False
@@ -748,7 +732,6 @@ def from_rts_to_regression_table(
             "{}={}".format(test_filter, test_name),
             "deployment_name={}".format(baseline_deployment_name),
             "triggering_env={}".format(tf_triggering_env),
-            "github_org={}".format(baseline_github_org),
         ]
         if running_platform is not None:
             filters_baseline.append("running_platform={}".format(running_platform))
@@ -758,7 +741,6 @@ def from_rts_to_regression_table(
             "{}={}".format(test_filter, test_name),
             "deployment_name={}".format(comparison_deployment_name),
             "triggering_env={}".format(tf_triggering_env),
-            "github_org={}".format(comparison_github_org),
         ]
         if running_platform is not None:
             filters_comparison.append("running_platform={}".format(running_platform))
@@ -1061,9 +1043,9 @@ def get_v_pct_change_and_largest_var(
             if last_n < 0 or (last_n > 0 and len(comparison_values) < last_n):
                 comparison_values.append(tuple[1])
         comparison_df = pd.DataFrame(comparison_values)
-        comparison_median = float(comparison_df.median().iloc[0])
+        comparison_median = float(comparison_df.median())
         comparison_v = comparison_median
-        comparison_std = float(comparison_df.std().iloc[0])
+        comparison_std = float(comparison_df.std())
         if verbose:
             logging.info(
                 "comparison_datapoints: {} value: {}; std-dev: {}; median: {}".format(

redisbench_admin/deploy/deploy.py

@@ -69,13 +69,19 @@ def deploy_command_logic(args, project_name, project_version):
     )
     tf_setup_name_sufix = "{}-{}".format(args.setup_name_sufix, tf_github_sha)
     tf_setup_name = "{}{}".format(remote_setup, tf_setup_name_sufix)
-    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(
-        tf_setup_name
-    ).replace("/", "-")
+    terraform_backend_key = "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
     tf_triggering_env = "redisbench-admin-deploy"
     logging.info("Setting an infra timeout of {} secs".format(infra_timeout_secs))
     if args.destroy is False:
-        (tf_return_code, _, _, _, _, _, _,) = setup_remote_environment(
+        (
+            tf_return_code,
+            _,
+            _,
+            _,
+            _,
+            _,
+            _,
+        ) = setup_remote_environment(
             tf,
             tf_github_sha,
             tf_github_actor,
@@ -103,7 +109,6 @@ def deploy_command_logic(args, project_name, project_version):
         _, _, _ = tf.init(
             capture_output=True,
             backend_config={"key": terraform_backend_key},
-            reconfigure=True,
         )
         logging.info("Refreshing remote state")
         _, _, _ = tf.refresh()

redisbench_admin/export/export.py

@@ -42,7 +42,13 @@ def export_command_logic(args, project_name, project_version):
     deployment_name = args.deployment_name
     deployment_type = args.deployment_type
     results_format = args.results_format
-    (_, github_branch, github_org, github_repo, _,) = git_vars_crosscheck(
+    (
+        _,
+        github_branch,
+        github_org,
+        github_repo,
+        _,
+    ) = git_vars_crosscheck(
         None, args.github_branch, args.github_org, args.github_repo, None
     )
     exporter_timemetric_path = None

redisbench_admin/profilers/perf.py

@@ -400,9 +400,9 @@ class Perf:
             "Main THREAD Flame Graph: " + use_case, details
         )
         if artifact_result is True:
-            outputs[
-                "Main THREAD Flame Graph {}".format(identifier)
-            ] = flame_graph_output
+            outputs["Main THREAD Flame Graph {}".format(identifier)] = (
+                flame_graph_output
+            )
         result &= artifact_result
 
         tid = self.pid
@@ -440,9 +440,9 @@ class Perf:
         )
 
         if artifact_result is True:
-            outputs[
-                "perf report per dso,sym {}".format(identifier)
-            ] = perf_report_artifact
+            outputs["perf report per dso,sym {}".format(identifier)] = (
+                perf_report_artifact
+            )
         result &= artifact_result
 
         # generate perf report per dso,sym
@@ -460,9 +460,9 @@ class Perf:
         )
 
         if artifact_result is True:
-            outputs[
-                "perf report per dso,sym with callgraph {}".format(identifier)
-            ] = perf_report_artifact
+            outputs["perf report per dso,sym with callgraph {}".format(identifier)] = (
+                perf_report_artifact
+            )
         result &= artifact_result
 
         # generate perf report per dso,sym,srcline
@@ -487,9 +487,9 @@ class Perf:
         )
 
         if artifact_result is True:
-            outputs[
-                "perf report per dso,sym,srcline {}".format(identifier)
-            ] = perf_report_artifact
+            outputs["perf report per dso,sym,srcline {}".format(identifier)] = (
+                perf_report_artifact
+            )
         result &= artifact_result
 
         self.logger.info(
@@ -527,9 +527,9 @@ class Perf:
         )
 
         if artifact_result is True:
-            outputs[
-                "perf report top self-cpu {}".format(identifier)
-            ] = perf_report_artifact
+            outputs["perf report top self-cpu {}".format(identifier)] = (
+                perf_report_artifact
+            )
         result &= artifact_result
 
         # generate perf report --stdio report
@@ -546,9 +546,9 @@ class Perf:
             )
 
             if artifact_result is True:
-                outputs[
-                    "perf report top self-cpu (dso={})".format(binary)
-                ] = perf_report_artifact
+                outputs["perf report top self-cpu (dso={})".format(binary)] = (
+                    perf_report_artifact
+                )
         result &= artifact_result
 
         if self.callgraph_mode == "dwarf":
@@ -590,9 +590,9 @@ class Perf:
                 )
                 result &= artifact_result
                 if artifact_result is True:
-                    outputs[
-                        "Top entries in text form by LOC"
-                    ] = pprof_artifact_text_output
+                    outputs["Top entries in text form by LOC"] = (
+                        pprof_artifact_text_output
+                    )
                     tabular_data_map["text-lines"] = tabular_data
                 self.logger.info("Generating pprof png output")
                 pprof_png_output = self.output + ".pprof.png"
@@ -604,9 +604,9 @@ class Perf:
                     self.output,
                 )
                 if artifact_result is True:
-                    outputs[
-                        "Output graph image in PNG format"
-                    ] = pprof_artifact_png_output
+                    outputs["Output graph image in PNG format"] = (
+                        pprof_artifact_png_output
+                    )
                 result &= artifact_result
 
         # save stack collapsed

redisbench_admin/run/args.py

@@ -44,9 +44,20 @@ KEEP_ENV = bool(int(os.getenv("KEEP_ENV", "0")))
 ALLOWED_TOOLS_DEFAULT = "memtier_benchmark,redis-benchmark,redisgraph-benchmark-go,ycsb,go-ycsb,tsbs_run_queries_redistimeseries,tsbs_load_redistimeseries,ftsb_redisearch,aibench_run_inference_redisai_vision,ann-benchmarks"
 ALLOWED_BENCH_TOOLS = os.getenv("ALLOWED_BENCH_TOOLS", ALLOWED_TOOLS_DEFAULT)
 SKIP_DB_SETUP = bool(int(os.getenv("SKIP_DB_SETUP", "0")))
+ARCH_X86 = "x86_64"
+ARCH_ARM = "aarch64"
+VALID_ARCHS = [ARCH_X86, ARCH_ARM]
+ARCH = os.getenv("ARCH", ARCH_X86)
 
 
 def common_run_args(parser):
+    parser.add_argument(
+        "--architecture",
+        type=str,
+        required=False,
+        default=ARCH,
+        help=f"Architecture to run the benchmark on. One of {VALID_ARCHS}.",
+    )
     parser.add_argument(
         "--keep_env_and_topo",
         required=False,

redisbench_admin/run/common.py

@@ -206,7 +206,10 @@ def prepare_benchmark_parameters_specif_tooling(
         if isremote is True:
             benchmark_tool = "/tmp/{}".format(benchmark_tool)
             input_data_file = "/tmp/input.data"
-        (command_arr, command_str,) = prepare_tsbs_benchmark_command(
+        (
+            command_arr,
+            command_str,
+        ) = prepare_tsbs_benchmark_command(
             benchmark_tool,
             server_private_ip,
             server_plaintext_port,
@@ -218,7 +221,10 @@ def prepare_benchmark_parameters_specif_tooling(
             cluster_api_enabled,
         )
     if "memtier_benchmark" in benchmark_tool:
-        (command_arr, command_str,) = prepare_memtier_benchmark_command(
+        (
+            command_arr,
+            command_str,
+        ) = prepare_memtier_benchmark_command(
             benchmark_tool,
             server_private_ip,
             server_plaintext_port,
@@ -236,7 +242,10 @@ def prepare_benchmark_parameters_specif_tooling(
             ann_path = stdout[0].strip() + "/run/ann/pkg/multirun.py"
             logging.info("Remote ann-benchmark path: {}".format(ann_path))
 
-        (command_arr, command_str,) = prepare_ann_benchmark_command(
+        (
+            command_arr,
+            command_str,
+        ) = prepare_ann_benchmark_command(
             server_private_ip,
             server_plaintext_port,
             cluster_api_enabled,
@@ -250,7 +259,10 @@ def prepare_benchmark_parameters_specif_tooling(
         if isremote is True:
             benchmark_tool = "/tmp/{}".format(benchmark_tool)
             input_data_file = "/tmp/input.data"
-        (command_arr, command_str,) = prepare_ftsb_benchmark_command(
+        (
+            command_arr,
+            command_str,
+        ) = prepare_ftsb_benchmark_command(
             benchmark_tool,
             server_private_ip,
             server_plaintext_port,
@@ -267,7 +279,10 @@ def prepare_benchmark_parameters_specif_tooling(
         if isremote is True:
             benchmark_tool = "/tmp/{}".format(benchmark_tool)
             input_data_file = "/tmp/input.data"
-        (command_arr, command_str,) = prepare_aibench_benchmark_command(
+        (
+            command_arr,
+            command_str,
+        ) = prepare_aibench_benchmark_command(
             benchmark_tool,
             server_private_ip,
             server_plaintext_port,
@@ -619,11 +634,9 @@ def run_redis_pre_steps(benchmark_config, r, required_modules):
         )
         search_specific_init(r, module_names)
     if required_modules is not None and len(required_modules) > 0:
-        artifact_pos = check_required_modules(module_names, required_modules)
-        version = artifact_versions[artifact_pos]
-        logging.info(
-            f"Using version {version} in by version timeseries coming from {module_names[artifact_pos]}"
-        )
+        check_required_modules(module_names, required_modules)
+
+        version = artifact_versions[0]
     else:
         version = r.info("server")["redis_version"]
 
@@ -689,45 +702,54 @@ def dso_check(dso, local_module_file):
 
 
 def dbconfig_keyspacelen_check(
-    benchmark_config, redis_conns, ignore_keyspace_errors=False
+    benchmark_config, redis_conns, ignore_keyspace_errors=False, timeout=60
 ):
-    result = True
+    start_time = time.time()
     (
         requires_keyspacelen_check,
         keyspacelen,
     ) = check_dbconfig_keyspacelen_requirement(benchmark_config)
-    if requires_keyspacelen_check:
-        result = False
+
+    if not requires_keyspacelen_check:
+        return True
+
+    attempt = 0
+    while time.time() - start_time < timeout:
         logging.info(
-            "Ensuring keyspace length requirement = {} is met.".format(keyspacelen)
+            f"Ensuring keyspace length requirement = {keyspacelen} is met. attempt #{attempt+1}"
         )
         total_keys = 0
         for shard_conn in redis_conns:
             keyspace_dict = shard_conn.info("keyspace")
             for _, dbdict in keyspace_dict.items():
-                shard_keys = dbdict["keys"]
-                total_keys += shard_keys
+                total_keys += dbdict.get("keys", 0)
 
         if total_keys == keyspacelen:
             logging.info(
-                "The total numbers of keys in setup matches the expected spec: {}=={}".format(
+                "The total number of keys in setup matches the expected spec: {} == {}".format(
                     keyspacelen, total_keys
                 )
             )
-            result = True
-        else:
-            logging.error(
-                "The total numbers of keys in setup does not match the expected spec: {}!={}. Aborting...".format(
-                    keyspacelen, total_keys
-                )
+            return True
+
+        logging.warning(
+            "Keyspace length mismatch ({} != {}). Retrying in {} seconds...".format(
+                total_keys, keyspacelen, 2**attempt
             )
-            if ignore_keyspace_errors is False:
-                raise Exception(
-                    "The total numbers of keys in setup does not match the expected spec: {}!={}. Aborting...".format(
-                        keyspacelen, total_keys
-                    )
-                )
-    return result
+        )
+        time.sleep(2**attempt)  # Exponential backoff
+        attempt += 1
+
+    logging.error(
+        f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt+1} tries..."
+    )
+
+    if not ignore_keyspace_errors:
+        raise Exception(
+            f"The total number of keys in setup does not match the expected spec: {keyspacelen} != {total_keys}. Aborting after {attempt+1} tries..."
+        )
+
+    return False
 
 
 def common_properties_log(
@@ -765,7 +787,10 @@ def print_results_table_stdout(
     metric_names=[],
 ):
     # check which metrics to extract
-    (_, metrics,) = merge_default_and_config_metrics(
+    (
+        _,
+        metrics,
+    ) = merge_default_and_config_metrics(
         benchmark_config,
         default_metrics,
         None,

redisbench_admin/run/ftsb/ftsb.py

@@ -29,7 +29,6 @@ def prepare_ftsb_benchmark_command(
     :return: [string] containing the required command to run the benchmark given the configurations
     """
     command_arr = [executable_path]
-
     command_arr.extend(
         ["--host", "{}:{}".format(server_private_ip, server_plaintext_port)]
     )

redisbench_admin/run/ssh.py

@@ -42,7 +42,6 @@ def ssh_tunnel_redisconn(
         ),  # remote redis server
         # Bind the socket to port 0. A random free port from 1024 to 65535 will be selected.
         local_bind_address=("0.0.0.0", 0),  # enable local forwarding port
-        set_keepalive=60,
     )
     ssh_tunel.start()  # start tunnel
     redis_conn = redis.Redis(
@@ -70,19 +69,6 @@ def check_connection(ssh_conn):
         return False
 
 
-def ensure_400_permissions(file_path):
-    import stat
-
-    file_stat = os.stat(file_path)
-    current_permissions = stat.S_IMODE(file_stat.st_mode)
-
-    if current_permissions != 0o400:
-        logging.info(f"Changing permissions of {file_path} to 400")
-        os.chmod(file_path, 0o400)
-    else:
-        logging.info(f"{file_path} already has 400 permissions.")
-
-
 def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
     if os.path.exists(private_key) is False:
         if EC2_PRIVATE_PEM is not None and EC2_PRIVATE_PEM != "":
@@ -103,4 +89,3 @@ def ssh_pem_check(EC2_PRIVATE_PEM, private_key):
         logging.info(
             "Confirmed that private key path artifact: '{}' exists!".format(private_key)
         )
-    ensure_400_permissions(private_key)

redisbench_admin/run_async/async_terraform.py

@@ -114,7 +114,11 @@ class TerraformClass:
     def async_runner_setup(
         self,
     ):
-        (remote_setup, deployment_type, remote_id,) = fetch_remote_setup_from_config(
+        (
+            remote_setup,
+            deployment_type,
+            remote_id,
+        ) = fetch_remote_setup_from_config(
             [{"type": "async", "setup": "runner"}],
             "https://github.com/RedisLabsModules/testing-infrastructure.git",
             "master",
@@ -229,7 +233,11 @@ def terraform_spin_or_reuse_env(
     tf_override_name=None,
     tf_folder_path=None,
 ):
-    (remote_setup, deployment_type, remote_id,) = fetch_remote_setup_from_config(
+    (
+        remote_setup,
+        deployment_type,
+        remote_id,
+    ) = fetch_remote_setup_from_config(
         benchmark_config["remote"],
         "https://github.com/RedisLabsModules/testing-infrastructure.git",
         "master",

redisbench_admin/run_async/render_files.py

@@ -28,9 +28,9 @@ WantedBy=multi-user.target
         argv.append("--private_key")
         argv.append("/home/ubuntu/work_dir/tests/benchmarks/benchmarks.redislabs.pem")
     else:
-        argv[
-            argv.index(args.private_key)
-        ] = "/home/ubuntu/work_dir/tests/benchmarks/benchmarks.redislabs.pem"
+        argv[argv.index(args.private_key)] = (
+            "/home/ubuntu/work_dir/tests/benchmarks/benchmarks.redislabs.pem"
+        )
     if len(args.module_path) != 0:
         argv[argv.index(args.module_path[0])] = (
             "/home/ubuntu/work_dir/tests/benchmarks/"

redisbench_admin/run_local/args.py

@@ -12,6 +12,7 @@ FLUSHALL_AT_START = bool(int(os.getenv("FLUSHALL_AT_START", "1")))
 IGNORE_KEYSPACE_ERRORS = bool(int(os.getenv("IGNORE_KEYSPACE_ERRORS", "0")))
 SKIP_REDIS_SPIN = bool(int(os.getenv("SKIP_REDIS_SPIN", "0")))
 REDIS_PORT = int(os.getenv("REDIS_PORT", "6379"))
+REDIS_AUTH = os.getenv("REDIS_AUTH", None)
 REDIS_HOST = os.getenv("REDIS_HOST", "127.0.0.1")
 
 
@@ -19,6 +20,7 @@ def create_run_local_arguments(parser):
     parser = common_run_args(parser)
     parser.add_argument("--port", type=int, default=REDIS_PORT)
     parser.add_argument("--host", type=str, default=REDIS_HOST)
+    parser.add_argument("--password", type=str, default=REDIS_AUTH)
     parser.add_argument("--redis-binary", type=str, default=REDIS_BINARY)
     parser.add_argument(
         "--flushall_on_every_test_start",

redisbench_admin/run_local/local_db.py

@@ -158,7 +158,7 @@ def local_db_spin(
             logging.info("Skipping DB spin step...")
 
     if setup_type == "oss-standalone":
-        r = redis.Redis(port=args.port, host=args.host)
+        r = redis.Redis(port=args.port, host=args.host, password=args.password)
         r.ping()
         r.client_setname("redisbench-admin-standalone")
         redis_conns.append(r)
@@ -192,6 +192,11 @@ def local_db_spin(
             benchmark_tool_workdir,
             cluster_api_enabled,
             "dbconfig",
+            None,
+            None,
+            None,
+            None,
+            args.password,
         )
 
         # run the benchmark
@@ -206,7 +211,6 @@ def local_db_spin(
                 load_via_benchmark_duration_seconds
             )
         )
-
     dbconfig_keyspacelen_check(benchmark_config, redis_conns, ignore_keyspace_errors)
 
     artifact_version = run_redis_pre_steps(

redisbench_admin/run_local/run_local.py

@@ -298,6 +298,12 @@ def run_local_command_logic(args, project_name, project_version):
                                     False,
                                     benchmark_tool_workdir,
                                     cluster_api_enabled,
+                                    "clientconfig",
+                                    None,
+                                    None,
+                                    None,
+                                    None,
+                                    args.password,
                                 )
                                 redis_pids = [
                                     redis_process.pid
@@ -680,17 +686,17 @@ def commandstats_latencystats_process_name(
             branch = variant_labels_dict["branch"]
 
         if version is not None:
-            variant_labels_dict[
-                "command_and_metric_and_version"
-            ] = "{} - {} - {}".format(command, metric, version)
-            variant_labels_dict[
-                "command_and_metric_and_setup_and_version"
-            ] = "{} - {} - {} - {}".format(command, metric, setup_name, version)
+            variant_labels_dict["command_and_metric_and_version"] = (
+                "{} - {} - {}".format(command, metric, version)
+            )
+            variant_labels_dict["command_and_metric_and_setup_and_version"] = (
+                "{} - {} - {} - {}".format(command, metric, setup_name, version)
+            )
 
         if branch is not None:
-            variant_labels_dict[
-                "command_and_metric_and_branch"
-            ] = "{} - {} - {}".format(command, metric, branch)
-            variant_labels_dict[
-                "command_and_metric_and_setup_and_branch"
-            ] = "{} - {} - {} - {}".format(command, metric, setup_name, branch)
+            variant_labels_dict["command_and_metric_and_branch"] = (
+                "{} - {} - {}".format(command, metric, branch)
+            )
+            variant_labels_dict["command_and_metric_and_setup_and_branch"] = (
+                "{} - {} - {} - {}".format(command, metric, setup_name, branch)
+            )

redisbench_admin/run_remote/remote_env.py

@@ -7,6 +7,7 @@ import logging
 
 from python_terraform import TerraformCommandError
 
+from redisbench_admin.run.args import ARCH_X86, ARCH_ARM
 from redisbench_admin.run_remote.terraform import (
     retrieve_inventory_info,
     terraform_spin_or_reuse_env,
@@ -33,11 +34,22 @@ def remote_env_setup(
     spot_instance_error=False,
     spot_price_counter=0,
     full_price_counter=0,
+    architecture=ARCH_X86,
 ):
     server_plaintext_port = args.db_port
     db_ssh_port = args.db_ssh_port
     client_ssh_port = args.client_ssh_port
     username = args.user
+    if architecture != ARCH_X86 and tf_folder_path is not None:
+        logging.info(
+            f"Checking if the architecture info is specified on the terraform path {tf_folder_path}"
+        )
+        if architecture is ARCH_ARM and ARCH_ARM not in tf_folder_path:
+            logging.info(f"adding suffix '-{ARCH_ARM}' to {tf_folder_path}")
+            tf_folder_path = "{tf_folder_path}-{ARCH_ARM}"
+        else:
+            logging.info(f"'-{ARCH_ARM}' suffix already in {tf_folder_path}")
+
     if args.inventory is not None:
         (
             status,

redisbench_admin/run_remote/remote_helpers.py

@@ -274,7 +274,6 @@ def post_process_remote_run(
     tmp,
     result_csv_filename="result.csv",
 ):
-    results_dict = {}
     if benchmark_tool == "redis-benchmark":
         local_benchmark_output_filename = tmp
         with open(result_csv_filename, "r", encoding="utf-8") as txt_file:

redisbench_admin/run_remote/run_remote.py

@@ -21,7 +21,7 @@ from redisbench_admin.profilers.perf_daemon_caller import (
     PerfDaemonRemoteCaller,
     PERF_DAEMON_LOGNAME,
 )
-from redisbench_admin.run.args import PROFILE_FREQ
+from redisbench_admin.run.args import PROFILE_FREQ, VALID_ARCHS
 from redisbench_admin.run.common import (
     get_start_time_vars,
     BENCHMARK_REPETITIONS,
@@ -300,6 +300,14 @@ def run_remote_command_logic(args, project_name, project_version):
     benchmark_artifacts_table_name = "Benchmark client artifacts"
     benchmark_artifacts_table_headers = ["Setup", "Test-case", "Artifact", "link"]
     benchmark_artifacts_links = []
+    architecture = args.architecture
+    if architecture not in VALID_ARCHS:
+        logging.critical(
+            f"The specified architecture {architecture} is not valid. Specify one of {VALID_ARCHS}"
+        )
+        exit(1)
+    else:
+        logging.info("Running benchmark for architecture {architecture}")
 
     # contains the overall target-tables ( if any target is defined )
     overall_tables = {}
@@ -346,10 +354,7 @@ def run_remote_command_logic(args, project_name, project_version):
 
                 # map from setup name to overall target-tables ( if any target is defined )
                 overall_tables[setup_name] = {}
-                total_benchmarks = len(benchmarks_map.keys())
-                import tqdm
 
-                pbar = tqdm.tqdm(total=total_benchmarks, unit="benchmarks")
                 for test_name, benchmark_config in benchmarks_map.items():
                     if return_code != 0 and args.fail_fast:
                         logging.warning(
@@ -374,7 +379,9 @@ def run_remote_command_logic(args, project_name, project_version):
                             continue
                         remote_perf = None
                         logging.info(
-                            f"Repetition {repetition} of {BENCHMARK_REPETITIONS}. Running test {test_name}. Total benchmarks {total_benchmarks}"
+                            "Repetition {} of {}. Running test {}".format(
+                                repetition, BENCHMARK_REPETITIONS, test_name
+                            )
                         )
                         (
                             setup_name,
@@ -442,6 +449,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                     spot_instance_error,
                                     0,
                                     0,
+                                    architecture,
                                 )
 
                                 # after we've created the env, even on error we should always teardown
@@ -1093,7 +1101,6 @@ def run_remote_command_logic(args, project_name, project_version):
                                     f"Test {test_name} does not have remote config. Skipping test."
                                 )
 
-                    pbar.update()
     if len(benchmark_artifacts_links) > 0:
         writer = MarkdownTableWriter(
             table_name=benchmark_artifacts_table_name,
@@ -1376,20 +1383,20 @@ def commandstats_latencystats_process_name(
             branch = variant_labels_dict["branch"]
 
         if version is not None:
-            variant_labels_dict[
-                "command_and_metric_and_version"
-            ] = "{} - {} - {}".format(command, metric, version)
-            variant_labels_dict[
-                "command_and_metric_and_setup_and_version"
-            ] = "{} - {} - {} - {}".format(command, metric, setup_name, version)
+            variant_labels_dict["command_and_metric_and_version"] = (
+                "{} - {} - {}".format(command, metric, version)
+            )
+            variant_labels_dict["command_and_metric_and_setup_and_version"] = (
+                "{} - {} - {} - {}".format(command, metric, setup_name, version)
+            )
 
         if branch is not None:
-            variant_labels_dict[
-                "command_and_metric_and_branch"
-            ] = "{} - {} - {}".format(command, metric, branch)
-            variant_labels_dict[
-                "command_and_metric_and_setup_and_branch"
-            ] = "{} - {} - {} - {}".format(command, metric, setup_name, branch)
+            variant_labels_dict["command_and_metric_and_branch"] = (
+                "{} - {} - {}".format(command, metric, branch)
+            )
+            variant_labels_dict["command_and_metric_and_setup_and_branch"] = (
+                "{} - {} - {} - {}".format(command, metric, setup_name, branch)
+            )
 
 
 def shutdown_remote_redis(redis_conns, ssh_tunnel):

redisbench_admin/run_remote/standalone.py

@@ -76,7 +76,6 @@ def remote_module_files_cp(
 ):
     remote_module_files = []
     if local_module_files is not None:
-        logging.info(f"local_module_files: {local_module_files}")
         for local_module_file in local_module_files:
             splitted_module_and_plugins = []
             if type(local_module_file) is str:
@@ -136,10 +135,7 @@ def remote_module_files_cp(
                 if pos > 1:
                     remote_module_files_in = remote_module_files_in + " "
                 remote_module_files_in = remote_module_files_in + remote_module_file
-            logging.info(
-                f"appending to {remote_module_files} remote file {remote_module_files_in}"
-            )
-            remote_module_files.append(remote_module_files_in)
+        remote_module_files.append(remote_module_files_in)
     logging.info(
         "There are a total of {} remote files {}".format(
             len(remote_module_files), remote_module_files
@@ -157,9 +153,12 @@ def generate_remote_standalone_redis_cmd(
     enable_redis_7_config_directives=True,
     enable_debug_command="yes",
 ):
-    initial_redis_cmd = "redis-server --save '' --logfile {} --dir {} --daemonize yes --protected-mode no --enable-debug-command yes ".format(
+    initial_redis_cmd = "redis-server --save '' --logfile {} --dir {} --daemonize yes --protected-mode no ".format(
         logfile, temporary_dir
     )
+    if enable_redis_7_config_directives:
+        extra_str = " --enable-debug-command {} ".format(enable_debug_command)
+        initial_redis_cmd = initial_redis_cmd + extra_str
     full_logfile = "{}/{}".format(temporary_dir, logfile)
     if redis_configuration_parameters is not None:
         for (

redisbench_admin/run_remote/terraform.py

@@ -31,7 +31,11 @@ def terraform_spin_or_reuse_env(
     tf_override_name=None,
     tf_folder_path=None,
 ):
-    (remote_setup, deployment_type, remote_id,) = fetch_remote_setup_from_config(
+    (
+        remote_setup,
+        deployment_type,
+        remote_id,
+    ) = fetch_remote_setup_from_config(
         benchmark_config["remote"],
         "https://github.com/redis-performance/testing-infrastructure.git",
         "master",

redisbench_admin/utils/benchmark_config.py

@@ -565,7 +565,6 @@ def get_testfiles_to_process(
 
 
 def check_required_modules(module_names, required_modules):
-    position = -1
     if required_modules is not None:
         if len(required_modules) > 0:
             logging.info(
@@ -573,12 +572,6 @@ def check_required_modules(module_names, required_modules):
                     required_modules
                 )
             )
-            first_module = required_modules[0]
-            if first_module in module_names:
-                position = module_names.index(first_module)
-                logging.info(
-                    f"POSITION of 1st required module :{first_module} in the module names list {module_names}: pos={position} "
-                )
             for required_module in required_modules:
                 if required_module not in module_names:
                     raise Exception(
@@ -587,7 +580,6 @@ def check_required_modules(module_names, required_modules):
                             module_names,
                         )
                     )
-    return position
 
 
 def results_dict_kpi_check(benchmark_config, results_dict, return_code):

redisbench_admin/utils/remote.py

@@ -142,7 +142,7 @@ def execute_remote_commands(
     c = connect_remote_ssh(port, private_key, server_public_ip, username)
     for command in commands:
         logging.info('Executing remote command "{}"'.format(command))
-        stdin, stdout, stderr = c.exec_command(command, get_pty=get_pty, timeout=180)
+        stdin, stdout, stderr = c.exec_command(command, get_pty=get_pty)
         recv_exit_status = stdout.channel.recv_exit_status()  # status is 0
         stdout = stdout.readlines()
         stderr = stderr.readlines()
@@ -158,46 +158,13 @@ def execute_remote_commands(
 
 
 def connect_remote_ssh(port, private_key, server_public_ip, username):
-    import time
-    import socket
-
     k = paramiko.RSAKey.from_private_key_file(private_key)
     c = paramiko.SSHClient()
     c.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-
-    max_retries = 20
-    base_delay = 8  # Initial backoff time in seconds
-    max_delay = 900  # Maximum delay in seconds
-
-    for attempt in range(max_retries):
-        try:
-            logging.info(
-                f"Connecting to remote server {server_public_ip}, attempt {attempt + 1}"
-            )
-            c.connect(
-                hostname=server_public_ip,
-                port=port,
-                username=username,
-                pkey=k,
-                timeout=300,
-            )
-            logging.info(f"Connected to remote server {server_public_ip}")
-            return c
-        except (
-            paramiko.ssh_exception.NoValidConnectionsError,
-            socket.timeout,
-            paramiko.ssh_exception.SSHException,
-        ) as e:
-            wait_time = min(base_delay * (2**attempt), max_delay)
-            logging.warning(
-                f"Connection attempt {attempt + 1} failed: {e}. Retrying in {wait_time} seconds..."
-            )
-            time.sleep(wait_time)
-
-    logging.error("Failed to connect after multiple attempts.")
-    raise Exception(
-        f"Could not connect to {server_public_ip} after {max_retries} attempts."
-    )
+    logging.info("Connecting to remote server {}".format(server_public_ip))
+    c.connect(hostname=server_public_ip, port=port, username=username, pkey=k)
+    logging.info("Connected to remote server {}".format(server_public_ip))
+    return c
 
 
 def check_dataset_remote_requirements(
@@ -303,9 +270,7 @@ def setup_remote_environment(
     _, _, _ = tf.init(
         capture_output=True,
         backend_config={
-            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name).replace(
-                "/", "-"
-            )
+            "key": "benchmarks/infrastructure/{}.tfstate".format(tf_setup_name)
         },
     )
     _, _, _ = tf.refresh()
@@ -579,21 +544,12 @@ def common_tf(branch, path, repo, temporary_dir=None, destroy=False):
         temporary_dir = tempfile.mkdtemp()
     if destroy is False:
         logging.info(
-            "Fetching infrastructure definition from git repo {}{} (branch={}). Using local dir {} to store state".format(
+            "Fetching infrastructure definition from git repo {}/{} (branch={}). Using local dir {} to store state".format(
                 repo, path, branch, temporary_dir
             )
         )
         git.Repo.clone_from(repo, temporary_dir, branch=branch, depth=1)
-        logging.info(f"ensuring folder exists: {temporary_dir}")
-        assert os.path.exists(temporary_dir) and os.path.isdir(
-            temporary_dir
-        ), f"Folder '{temporary_dir}' does not exist"
-    if path[0] != "/":
-        temporary_dir = temporary_dir + "/"
     terraform_working_dir = temporary_dir + path
-    logging.info(
-        f"terraform_working_dir={terraform_working_dir}. temporary_dir={temporary_dir}. path={path}"
-    )
     return terraform_working_dir
 
 
@@ -605,7 +561,7 @@ def check_remote_setup_spot_instance(
     contains_spot_instance = False
     for remote_setup_property in remote_setup_config:
         if "spot_instance" in remote_setup_property:
-            spot_path = "terraform/" + remote_setup_property["spot_instance"]
+            spot_path = "/terraform/" + remote_setup_property["spot_instance"]
             contains_spot_instance = True
             logging.info(f"Detected spot instance config. Setup path: {spot_path}")
 
@@ -775,7 +731,10 @@ def extract_perversion_timeseries_from_results(
 ):
     break_by_key = "version"
     break_by_str = "by.{}".format(break_by_key)
-    (branch_time_series_dict, target_tables,) = common_timeseries_extraction(
+    (
+        branch_time_series_dict,
+        target_tables,
+    ) = common_timeseries_extraction(
         break_by_key,
         break_by_str,
         datapoints_timestamp,
@@ -946,9 +905,9 @@ def from_metric_kv_to_timeserie(
 
         target_table_dict[target_name] = target_value
 
-        target_table_dict[
-            "{}:percent {}".format(target_name, comparison_type)
-        ] = target_value_pct_str
+        target_table_dict["{}:percent {}".format(target_name, comparison_type)] = (
+            target_value_pct_str
+        )
     return target_table_keyname, target_table_dict
 
 

redisbench_admin/utils/utils.py

@@ -100,12 +100,17 @@ def generate_common_server_args(
             "''",
             "--port",
             "{}".format(port),
-            "--enable-debug-command",
-            "yes",
             "--dir",
             dbdir,
         ]
     )
+    if enable_redis_7_config_directives:
+        command.extend(
+            [
+                "--enable-debug-command",
+                enable_debug_command,
+            ]
+        )
 
     return command
 

redisbench_admin/watchdog/watchdog.py

@@ -31,15 +31,14 @@ def get_ci_ec2_instances_by_state(ec2_client, ci_machines_prefix, requested_stat
         instances = group["Instances"]
         for instance in instances:
             state = instance["State"]["Name"]
-            if "Tags" in instance:
-                for tag_dict in instance["Tags"]:
-                    key = tag_dict["Key"]
-                    key_v = tag_dict["Value"]
-                    if key == "Name":
-                        if ci_machines_prefix in key_v:
-                            if state == requested_state:
-                                count = count + 1
-                                state_instances.append(instance)
+            for tag_dict in instance["Tags"]:
+                key = tag_dict["Key"]
+                key_v = tag_dict["Value"]
+                if key == "Name":
+                    if ci_machines_prefix in key_v:
+                        if state == requested_state:
+                            count = count + 1
+                            state_instances.append(instance)
     return count, state_instances
 
 

{redisbench_admin-0.11.19.dist-info → redisbench_admin-0.11.21.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.19
+Version: 0.11.21
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com
-Requires-Python: >=3.9.0,<4.0.0
+Requires-Python: >=3.10.0,<4.0.0
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{redisbench_admin-0.11.19.dist-info → redisbench_admin-0.11.21.dist-info}/RECORD

@@ -3,11 +3,11 @@ redisbench_admin/cli.py,sha256=LAS5qnqScXKhxHYfXWB0mvAYaUYrSurIwadhexEa9g4,7740
 redisbench_admin/commands/__init__.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/commands/commands.json.py,sha256=mzVrEtqefFdopyzR-W6xx3How95dyZfToGKm1-_YzeY,95
 redisbench_admin/compare/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/compare/args.py,sha256=S6QFNQEY68Fm_2eQZzfpKetuJlSOnhzFm9koReq423c,5386
-redisbench_admin/compare/compare.py,sha256=zxZzMfLJqYaVogQnHm2cOsROg7VlE5g2majRfFO_hss,38483
+redisbench_admin/compare/args.py,sha256=10zbiT8roeTGnAubvoVFZTbJNbVxuRaRPtCKjxV8iNE,5226
+redisbench_admin/compare/compare.py,sha256=ANCm4kKCR8IBBoeBRgsPOOYW2s5qJV1QVIIPcY-WNUk,37725
 redisbench_admin/deploy/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/deploy/args.py,sha256=neLUcQqI__HkJItkQg2C293hl5g3yHG40t171r7-E5Y,1732
-redisbench_admin/deploy/deploy.py,sha256=l0yfWMYSGtcjcQes8t3i8-buO-jpEbzNJEU4Ik6FXC0,3853
+redisbench_admin/deploy/deploy.py,sha256=MtfJbsL97DLrbBYut6zRCzyEMebX4xWoZE-m4-JDRB8,3885
 redisbench_admin/environments/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/environments/oss_cluster.py,sha256=lUOG6oN8VXAnDXFK7Xns-ag-hSOSxxxL8jZ4Mh03hQY,6681
 redisbench_admin/environments/oss_standalone.py,sha256=Sl38rUpwJ3wNOl9zn38iK8q2iJi2pRFmaJAZJbuT_SQ,2474
@@ -15,7 +15,7 @@ redisbench_admin/export/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8z
 redisbench_admin/export/args.py,sha256=kzBfU21mXYWLZ8YPhKA8MCfxJo-OU4m8-OBZFY7VKnA,3189
 redisbench_admin/export/common/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/common/common.py,sha256=LnvXjMLlJRzMTxiFIjrfRFfDx9JJm88OZHu7lnTOpFA,4331
-redisbench_admin/export/export.py,sha256=Es4pPzNXvEtU_vxdasrc2BI9-D5_l6Tm5WRNzJVu9LU,10547
+redisbench_admin/export/export.py,sha256=JkdoMpbFnMEooNVSEmXQdyEfcU0SlFkO4jV6jGwYWRA,10593
 redisbench_admin/export/google_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/google_benchmark/google_benchmark_json_format.py,sha256=OuMaMmmma5VvXA0rcLIQSMxIq81oa5I3xYDFhbWj-IA,1804
 redisbench_admin/export/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -35,7 +35,7 @@ redisbench_admin/grafana_api/grafana_api.py,sha256=dG17GCYmWRILmy7h3-OiBeGzuNGnR
 redisbench_admin/profilers/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/profilers/daemon.py,sha256=Y4ZbbH-cRHJk9cvpsb60UZFq_HVHWXtatb7T2vtlRKo,12973
 redisbench_admin/profilers/flamegraph.pl,sha256=Za5XE-1gb_U-nzqwoyRwfe1TB182c64gITa-2klWTTA,35898
-redisbench_admin/profilers/perf.py,sha256=OjHI9iKqCx9vZDqRqz0xOGoeKLTRps-ikBKVxSJqwC4,27756
+redisbench_admin/profilers/perf.py,sha256=HtzzMVsXEJa1H7tOAfKlbFYDn2KnxAG_IU9yKPKZB7w,27772
 redisbench_admin/profilers/perf_daemon_caller.py,sha256=nD97cXmX3JytyafvNMmhUBq40uYrf6vtjdJ1TXZbvVY,4948
 redisbench_admin/profilers/pprof.py,sha256=g7oNC3AtNDTUOBIh_mIi5bFl_b0mL8tqBu6qKvAOrKw,3949
 redisbench_admin/profilers/profilers.py,sha256=4C1xaPyLoPydJ3eBAxW7IlSHG-3qj3A3BAKejiZXEK0,510
@@ -174,11 +174,11 @@ redisbench_admin/run/ann/pkg/templates/summary.html,sha256=Y-jePm8EGM41ensKay18R
 redisbench_admin/run/ann/pkg/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 redisbench_admin/run/ann/pkg/test/test-jaccard.py,sha256=oIhaQCQKrQokwv3fvgLSwPlRwkY0MNppG9Fc08oS3ZI,462
 redisbench_admin/run/ann/pkg/test/test-metrics.py,sha256=vJdS8Kuk8bAnpB65Uqb-9rUUI35XrHwaO3cNwKX5gxc,3057
-redisbench_admin/run/args.py,sha256=Sspv4eusQs9HMVMIyv_hB9vQ3S_s0lHYGAL1gPb2WGM,7864
+redisbench_admin/run/args.py,sha256=tevHZrezJ4RreHp6K-MGHko3e1Gi_IdsS2Q0jD2ZSoU,8173
 redisbench_admin/run/cluster.py,sha256=QuptSW-IhdyFIoQ3hzY613jtQWxBrVIlgc8OarcEK20,6072
-redisbench_admin/run/common.py,sha256=_nnvrSE1y7cOwha2BsaTM-j-PkFH2gf4LYu0FrbqKeQ,28172
+redisbench_admin/run/common.py,sha256=zRh2AxYks1-O_50qmk1WoD95C6xBaa5Hvs_-o7Q4ZFQ,28404
 redisbench_admin/run/ftsb/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run/ftsb/ftsb.py,sha256=plP-yxjMvvy-gITlXpuXJcyrPHfDoYYI8JRwTe5kK4M,2388
+redisbench_admin/run/ftsb/ftsb.py,sha256=aupMl27UZU6byUFsApBz5GLcdGd7lxtY6vCjJ3jnqJE,2387
 redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3064
 redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkvG4,9421
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -192,24 +192,24 @@ redisbench_admin/run/redisgraph_benchmark_go/redisgraph_benchmark_go.py,sha256=D
 redisbench_admin/run/redistimeseries.py,sha256=x3PA7QoHXu53zs5v0ekK2sVmUnA9_ZF2JxgCDf1Mui4,21331
 redisbench_admin/run/run.py,sha256=WIBc1q5198Ln3Elfgk6D1_ezuAKx5kM_xsxnxGe66-I,5586
 redisbench_admin/run/s3.py,sha256=pXQXZ1rrwDCWeBegGR4aKzbKqWWwMrmqvIjFxEB3bh4,442
-redisbench_admin/run/ssh.py,sha256=vLesv-a1Ze7Prb8rCnquBbLS1Svj-EZtrSs36RbVHro,3269
+redisbench_admin/run/ssh.py,sha256=gRW6ROoTKlaxLKhS5tM-Ejjd6zk2iO1KN9dzBzw7GOk,2835
 redisbench_admin/run/tsbs_run_queries_redistimeseries/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/tsbs_run_queries_redistimeseries/tsbs_run_queries_redistimeseries.py,sha256=9JWh23vG_4pNZuv6-kVk7_5C6qJ2ZOBWv53LxGMKXgs,2426
 redisbench_admin/run/ycsb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 redisbench_admin/run/ycsb/ycsb.py,sha256=cs5saVH7C4YpDvzhoa15PwEho59qTVR1E90v_FYjMVw,6873
 redisbench_admin/run_async/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_async/async_env.py,sha256=tE1turaaZNHfOaSpGxh62EJWp88zoQFUf3sMbaS7JRA,2408
-redisbench_admin/run_async/async_terraform.py,sha256=fRzhUq9kIPs0EjQxrpctkoNiI2Q4fKTdNlVbBDpG1Ys,11223
+redisbench_admin/run_async/async_terraform.py,sha256=ngOQnECUuC20pZwiJItaiBnzlwT2DiKciPTHtqLURe4,11299
 redisbench_admin/run_async/benchmark.py,sha256=S-dsaWGjgsPQxj8sXAACnbtNw5zlJnRFoo53ULbrMEY,1630
 redisbench_admin/run_async/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
-redisbench_admin/run_async/render_files.py,sha256=OMPy3-GnU14tQ4HNlF5utOnmzpRAXURwG_h8UDkTmYs,2674
+redisbench_admin/run_async/render_files.py,sha256=NMagmx-2hsMET_XN8tkmQz55g-azqW7SjAqaq4GL8F0,2676
 redisbench_admin/run_async/run_async.py,sha256=g2ZOQqj9vXZYaRyNpJZtgfYyY9tMuRmEv3Hh3qWOUs8,14525
 redisbench_admin/run_local/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run_local/args.py,sha256=VkIDvdTW-cRl-ncOkcK8-8MdCbq-qyipGQFugh9Fio0,1393
+redisbench_admin/run_local/args.py,sha256=9Qr-IVQJ3TMqFkn9Jp597KjU2AGq3u0X5Eb82CWD7wk,1504
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
-redisbench_admin/run_local/local_db.py,sha256=Xh7xyZaSyhmRXKyMsbKqO9aLUikf-EXGha3K1h9yL2M,7396
+redisbench_admin/run_local/local_db.py,sha256=9vINqKOs-wDMFEuEHT0I8KO9YnEo_h4NWNk5da3LwSY,7518
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=tueVqiqApQx2b0Dq6GJ84jr7WYRVKvJ7r2QCzlfY3aw,30870
+redisbench_admin/run_local/run_local.py,sha256=u2smgDsml6-nnjf4ptb4JeEetmtLyVhLGtzho-GGeNU,31149
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_remote/args.py,sha256=vhV87avBwXL8c2QLqrAkIyWD53MYhN06F-3wRv3l5xE,3829
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
@@ -217,26 +217,26 @@ redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNd
 redisbench_admin/run_remote/notifications.py,sha256=-W9fLaftEFNfplBl2clHk37jbYxliDbHftQ62khN31k,2157
 redisbench_admin/run_remote/remote_client.py,sha256=JqxsUjyxRtsChIkOWrVTGF_mQH0_8h7v5j-5rud448Y,14079
 redisbench_admin/run_remote/remote_db.py,sha256=a1_fnLhsCGv_0HMBB91zscHTFcHwmab_u1W7u-u1r3E,12929
-redisbench_admin/run_remote/remote_env.py,sha256=fTZliXW7Cz0ztew7IR2BNlqLd_l4_p-5Oc6rX7T5EdI,4605
+redisbench_admin/run_remote/remote_env.py,sha256=jUbqijwivVmbC4VKEnUkKVFogy1TRTswxUt4ObqYMeU,5187
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
-redisbench_admin/run_remote/remote_helpers.py,sha256=md58cuh11htP-_7mMQywNDy2zMcCCtrJaeUg7MH6owE,9840
-redisbench_admin/run_remote/run_remote.py,sha256=Y2EIiNzkktp_yu0CB3C8yjUXkbLBZSQ6RKGPJju7v0A,67599
-redisbench_admin/run_remote/standalone.py,sha256=na_T1V1PrqzhB68ixBXlcWyRv6rJDcQ3INRESstmVDk,6710
-redisbench_admin/run_remote/terraform.py,sha256=zD2gGuOmnTex6Dt2lhdAtNn21iL6sykPPXI10jJaim4,3945
+redisbench_admin/run_remote/remote_helpers.py,sha256=gy10SuKheBiL568ldiOdJaHRPJ_J7DxH_uZpqgOuylo,9818
+redisbench_admin/run_remote/run_remote.py,sha256=uI-c_7FpVjNeVBXcD1uBMLECJZ62Rpfg2Kidmoucle8,67820
+redisbench_admin/run_remote/standalone.py,sha256=vWmm0CdFtrasy-_1BDKO7I_gVPBjjiypv94_Fq2Sm7o,6660
+redisbench_admin/run_remote/terraform.py,sha256=ZOBrSjHrWRMHa9_ER_cS3UxbWK7IdzMkO0ZD-Hq8BAo,3975
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=sVhS2c3p4lBMga0g3U-S9rF8pntcI4qSKeX138emWm0,21753
+redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=4jA3qDnc_U36hP-sqiX_XB38UwVshMLcGvZ74aKMDWY,40363
+redisbench_admin/utils/remote.py,sha256=nNKKNmzZ4a44U7I3Wzc4fwaiKYNDDIGy-i-seovDkqU,38952
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
-redisbench_admin/utils/utils.py,sha256=nQkN3N2iVhoe2GlRxU3BBaicrtw5vZXFaqnstc4i2Fc,14034
+redisbench_admin/utils/utils.py,sha256=FLDjhGkW0PWwcu_nlTnIW6aZtHzJGz4LIwvu1CpCajw,14160
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
-redisbench_admin/watchdog/watchdog.py,sha256=NiveQyTq22ZCrZoPJYskP9s5MMLRXq9xCGdBwEMNMxg,6225
-redisbench_admin-0.11.19.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.19.dist-info/METADATA,sha256=ZC6onJul_jgW1PYydjCWYwLV5Jgp19RNqX_MQxd7eys,5438
-redisbench_admin-0.11.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.19.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.19.dist-info/RECORD,,
+redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
+redisbench_admin-0.11.21.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.21.dist-info/METADATA,sha256=RrK5OW8EH3XQEaaQmFvtHOtMCCJJutOkGYvvHBpTKJo,5389
+redisbench_admin-0.11.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.21.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.21.dist-info/RECORD,,