redisbench-admin 0.11.44__tar.gz → 0.11.46__tar.gz

{redisbench_admin-0.11.44 → redisbench_admin-0.11.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.44
+Version: 0.11.46
 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.44 → redisbench_admin-0.11.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.44"
+version = "0.11.46"
 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.44 → redisbench_admin-0.11.46}/redisbench_admin/run_remote/remote_db.py

@@ -118,6 +118,7 @@ def remote_db_spin(
 
     # 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

{redisbench_admin-0.11.44 → redisbench_admin-0.11.46}/redisbench_admin/utils/benchmark_config.py

@@ -150,7 +150,9 @@ def get_defaults(defaults_filename):
     )
 
 
-def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None):
+def get_final_benchmark_config(
+    default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None
+):
     result = False
     benchmark_config = None
     test_name = None
@@ -170,7 +172,7 @@ def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_fil
         # Merge dbconfig from defaults
         dbconfig_keyname = "dbconfig"
         if default_dbconfig is not None:
-            merge_default_and_specific_properties_dict_type(
+            merge_dbconfig_properties(
                 benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
             )
         test_name = benchmark_config["name"]
@@ -186,6 +188,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
 ):