redisbench-admin 0.11.43__tar.gz → 0.11.45__tar.gz

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.43
+Version: 0.11.45
 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

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.43"
+version = "0.11.45"
 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>","Redis Performance Group <performance@redis.com>"]
 readme = "README.md"

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/redisbench_admin/run_remote/remote_db.py

@@ -105,6 +105,8 @@ def remote_db_spin(
     continue_on_module_check_error=False,
     keyspace_check_timeout=60,
     architecture="x86_64",
+    custom_redis_server_path=None,
+    custom_redis_conf_path=None,
 ):
     (
         _,
@@ -114,6 +116,13 @@ def remote_db_spin(
         modules_configuration_parameters_map,
     ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
 
+    # Execute install_steps from dbconfig and clientconfig if present
+    from redisbench_admin.run_remote.standalone import execute_install_steps
+    if benchmark_config is not None:
+        execute_install_steps(
+            benchmark_config, server_public_ip, username, private_key, db_ssh_port
+        )
+
     full_logfiles = []
     cluster_enabled = False
     if setup_type == "oss-cluster":
@@ -207,6 +216,8 @@ def remote_db_spin(
                     db_ssh_port,
                     modules_configuration_parameters_map,
                     redis_7,
+                    custom_redis_server_path,
+                    custom_redis_conf_path,
                 )
                 full_logfiles.append(full_logfile)
             local_redis_conn, ssh_tunnel = ssh_tunnel_redisconn(

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/redisbench_admin/run_remote/run_remote.py

@@ -665,6 +665,8 @@ def run_remote_command_logic(args, project_name, project_version):
                                             continue_on_module_check_error,
                                             60,
                                             architecture,
+                                            args.redis_server_binary,
+                                            args.redis_conf,
                                         )
                                         if benchmark_type == "read-only":
                                             ro_benchmark_set(

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/redisbench_admin/run_remote/standalone.py

@@ -277,6 +277,8 @@ def spin_up_standalone_remote_redis(
     port=22,
     modules_configuration_parameters_map={},
     redis_7=True,
+    custom_redis_server_path=None,
+    custom_redis_conf_path=None,
 ):
     # Ensure redis-server is available before trying to start it
     ensure_redis_server_available(server_public_ip, username, private_key, port)
@@ -288,6 +290,8 @@ def spin_up_standalone_remote_redis(
         temporary_dir,
         modules_configuration_parameters_map,
         redis_7,
+        custom_redis_server_path=custom_redis_server_path,
+        custom_redis_conf_path=custom_redis_conf_path,
     )
 
     # start redis-server

{redisbench_admin-0.11.43 → redisbench_admin-0.11.45}/redisbench_admin/utils/benchmark_config.py

@@ -75,11 +75,12 @@ def prepare_benchmark_definitions(args):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
+        default_dbconfig,
     ) = get_defaults(defaults_filename)
     for usecase_filename in files:
         with open(usecase_filename, "r", encoding="utf8") as stream:
             test_result, benchmark_config, test_name = get_final_benchmark_config(
-                default_kpis, default_remote, stream, usecase_filename
+                default_kpis, default_remote, stream, usecase_filename, default_dbconfig
             )
             result &= test_result
             if test_result:
@@ -116,6 +117,7 @@ def get_defaults(defaults_filename):
     default_remote = None
     default_specs = None
     cluster_config = None
+    default_dbconfig = None
     if os.path.exists(defaults_filename):
         with open(defaults_filename, "r") as stream:
             logging.info(
@@ -128,6 +130,7 @@ def get_defaults(defaults_filename):
                 exporter_timemetric_path,
                 default_specs,
                 cluster_config,
+                default_dbconfig,
             ) = process_default_yaml_properties_file(
                 default_kpis,
                 default_remote,
@@ -143,10 +146,11 @@ def get_defaults(defaults_filename):
         exporter_timemetric_path,
         default_specs,
         cluster_config,
+        default_dbconfig,
     )
 
 
-def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename):
+def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None):
     result = False
     benchmark_config = None
     test_name = None
@@ -163,6 +167,12 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
             merge_default_and_specific_properties_dict_type(
                 benchmark_config, default_remote, kpis_keyname, usecase_filename
             )
+        # Merge dbconfig from defaults
+        dbconfig_keyname = "dbconfig"
+        if default_dbconfig is not None:
+            merge_dbconfig_properties(
+                benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
+            )
         test_name = benchmark_config["name"]
         result = True
     except Exception as e:
@@ -176,6 +186,56 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
     return result, benchmark_config, test_name
 
 
+def merge_dbconfig_properties(
+    benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
+):
+    """
+    Merge dbconfig properties from defaults with benchmark-specific dbconfig.
+    Handles both list and dict formats for dbconfig sections.
+    """
+    if dbconfig_keyname not in benchmark_config:
+        # No local dbconfig, use defaults entirely
+        benchmark_config[dbconfig_keyname] = default_dbconfig
+        logging.info(
+            f"Using exclusively default '{dbconfig_keyname}' properties from {usecase_filename}"
+        )
+    else:
+        # Merge defaults with local dbconfig
+        local_dbconfig = benchmark_config[dbconfig_keyname]
+
+        # Convert both to list format for consistent merging
+        if isinstance(default_dbconfig, dict):
+            default_list = [default_dbconfig]
+        else:
+            default_list = default_dbconfig
+
+        if isinstance(local_dbconfig, dict):
+            local_list = [local_dbconfig]
+        else:
+            local_list = local_dbconfig
+
+        # Merge: defaults first, then local (local takes precedence for conflicts)
+        merged_list = []
+
+        # Add all default items
+        for item in default_list:
+            merged_list.append(item)
+
+        # Add local items
+        for item in local_list:
+            merged_list.append(item)
+
+        # Convert back to original format if local was dict
+        if isinstance(local_dbconfig, dict) and len(merged_list) == 1:
+            benchmark_config[dbconfig_keyname] = merged_list[0]
+        else:
+            benchmark_config[dbconfig_keyname] = merged_list
+
+        logging.info(
+            f"Merged default and local '{dbconfig_keyname}' properties for {usecase_filename}"
+        )
+
+
 def merge_default_and_specific_properties_dict_type(
     benchmark_config, default_properties, propertygroup_keyname, usecase_filename
 ):
@@ -285,6 +345,7 @@ def process_default_yaml_properties_file(
     default_config = yaml.safe_load(stream)
     default_specs = None
     cluster_config = None
+    default_dbconfig = None
     default_metrics, exporter_timemetric_path = extract_exporter_metrics(default_config)
     if "remote" in default_config:
         logging.info(
@@ -300,6 +361,13 @@ def process_default_yaml_properties_file(
             )
         )
         default_kpis = default_config["kpis"]
+    if "dbconfig" in default_config:
+        logging.info(
+            "Loading default DBCONFIG specifications from file: {}".format(
+                defaults_filename
+            )
+        )
+        default_dbconfig = default_config["dbconfig"]
     if "spec" in default_config:
         logging.info(
             "Loading default setup SPECs from file: {}".format(defaults_filename)
@@ -319,6 +387,7 @@ def process_default_yaml_properties_file(
         exporter_timemetric_path,
         default_specs,
         cluster_config,
+        default_dbconfig,
     )