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

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

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

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

@@ -148,14 +148,7 @@ def create_run_remote_arguments(parser):
         "--spin-test",
         default=False,
         action="store_true",
-        help="Setup standalone Redis server, run INFO SERVER, print output as markdown and exit",
-    )
-    parser.add_argument(
-        "--spin-test-config",
-        required=False,
-        default=None,
-        type=str,
-        help="Optional benchmark configuration file for spin-test mode (to execute install_steps)",
+        help="Setup standalone Redis server, run INFO SERVER, print output as markdown and exit (reads install_steps from defaults.yml)",
     )
 
     return parser

{redisbench_admin-0.11.42 → redisbench_admin-0.11.44}/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.42 → redisbench_admin-0.11.44}/redisbench_admin/run_remote/run_remote.py

@@ -4,6 +4,7 @@
 #  All rights reserved.
 #
 import logging
+import os
 import random
 import string
 import sys
@@ -270,17 +271,30 @@ def run_remote_command_logic(args, project_name, project_version):
             logging.error("❌ --spin-test requires server_public_ip in --inventory")
             exit(1)
 
-        # Load benchmark config if provided
+        # Load benchmark config from defaults.yml
         benchmark_config = None
-        if args.spin_test_config:
+
+        # Try to load defaults.yml
+        defaults_file = (
+            args.defaults_filename
+            if hasattr(args, "defaults_filename")
+            else "defaults.yml"
+        )
+        if os.path.exists(defaults_file):
             try:
                 import yaml
-                with open(args.spin_test_config, 'r') as config_file:
-                    benchmark_config = yaml.safe_load(config_file)
-                    logging.info(f"📋 Loaded benchmark config from {args.spin_test_config}")
+
+                with open(defaults_file, "r") as config_file:
+                    defaults_config = yaml.safe_load(config_file)
+                    if defaults_config:
+                        benchmark_config = defaults_config
+                        logging.info(f"📋 Loaded configuration from {defaults_file}")
             except Exception as e:
-                logging.error(f"❌ Failed to load benchmark config: {e}")
-                exit(1)
+                logging.warning(f"⚠️ Failed to load defaults config: {e}")
+        else:
+            logging.info(
+                f"📋 No {defaults_file} found - proceeding without install_steps"
+            )
 
         # Run spin test
         success = spin_test_standalone_redis(
@@ -651,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.42 → redisbench_admin-0.11.44}/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
@@ -457,7 +461,9 @@ def generate_remote_standalone_redis_cmd(
     return full_logfile, initial_redis_cmd
 
 
-def execute_install_steps(benchmark_config, server_public_ip, username, private_key, db_ssh_port):
+def execute_install_steps(
+    benchmark_config, server_public_ip, username, private_key, db_ssh_port
+):
     """
     Execute install_steps from dbconfig and clientconfig sections.
 
@@ -496,7 +502,9 @@ def execute_install_steps(benchmark_config, server_public_ip, username, private_
                     steps = config_item["install_steps"]
                     if isinstance(steps, list):
                         install_commands.extend(steps)
-                        logging.info(f"📦 Found {len(steps)} install steps in clientconfig")
+                        logging.info(
+                            f"📦 Found {len(steps)} install steps in clientconfig"
+                        )
         elif isinstance(clientconfig, dict):
             if "install_steps" in clientconfig:
                 steps = clientconfig["install_steps"]
@@ -592,6 +600,11 @@ def spin_test_standalone_redis(
         remote_redis_server_path = None
 
         if custom_redis_conf_path:
+            # Convert relative paths to absolute paths
+            custom_redis_conf_path = os.path.abspath(
+                os.path.expanduser(custom_redis_conf_path)
+            )
+
             if not os.path.exists(custom_redis_conf_path):
                 logging.error(
                     f"❌ Custom redis.conf file not found: {custom_redis_conf_path}"
@@ -599,7 +612,9 @@ def spin_test_standalone_redis(
                 return False
 
             remote_redis_conf_path = f"{temporary_dir}/redis.conf"
-            logging.info(f"📁 Copying custom redis.conf to remote host...")
+            logging.info(
+                f"📁 Copying custom redis.conf from {custom_redis_conf_path} to {remote_redis_conf_path}"
+            )
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -615,8 +630,17 @@ def spin_test_standalone_redis(
             if not copy_result:
                 logging.error("❌ Failed to copy redis.conf to remote host")
                 return False
+            else:
+                logging.info(
+                    f"✅ Successfully copied redis.conf to {remote_redis_conf_path}"
+                )
 
         if custom_redis_server_path:
+            # Convert relative paths to absolute paths
+            custom_redis_server_path = os.path.abspath(
+                os.path.expanduser(custom_redis_server_path)
+            )
+
             if not os.path.exists(custom_redis_server_path):
                 logging.error(
                     f"❌ Custom redis-server binary not found: {custom_redis_server_path}"
@@ -624,7 +648,9 @@ def spin_test_standalone_redis(
                 return False
 
             remote_redis_server_path = f"{temporary_dir}/redis-server"
-            logging.info(f"📁 Copying custom redis-server binary to remote host...")
+            logging.info(
+                f"📁 Copying custom redis-server binary from {custom_redis_server_path} to {remote_redis_server_path}"
+            )
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -653,7 +679,9 @@ def spin_test_standalone_redis(
                     f"⚠️ Failed to make redis-server binary executable: {stderr}"
                 )
             else:
-                logging.info("✅ Redis-server binary made executable")
+                logging.info(
+                    f"✅ Successfully copied and made executable: {remote_redis_server_path}"
+                )
 
         # Copy modules if provided
         remote_module_files = None
@@ -680,6 +708,13 @@ def spin_test_standalone_redis(
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"
+
+        # Log what paths we're using
+        logging.info(f"🔧 Redis command generation:")
+        logging.info(f"   - Custom server path: {remote_redis_server_path}")
+        logging.info(f"   - Custom config path: {remote_redis_conf_path}")
+        logging.info(f"   - Module files: {remote_module_files}")
+
         _, redis_cmd = generate_remote_standalone_redis_cmd(
             logfile,
             redis_configuration_parameters,

{redisbench_admin-0.11.42 → redisbench_admin-0.11.44}/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_default_and_specific_properties_dict_type(
+                benchmark_config, default_dbconfig, dbconfig_keyname, usecase_filename
+            )
         test_name = benchmark_config["name"]
         result = True
     except Exception as e:
@@ -285,6 +295,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 +311,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 +337,7 @@ def process_default_yaml_properties_file(
         exporter_timemetric_path,
         default_specs,
         cluster_config,
+        default_dbconfig,
     )