redisbench-admin 0.11.42__py3-none-any.whl → 0.11.43__py3-none-any.whl

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/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(

redisbench_admin/run_remote/standalone.py

@@ -457,7 +457,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 +498,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 +596,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 +608,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 +626,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 +644,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 +675,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 +704,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.dist-info → redisbench_admin-0.11.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.42
+Version: 0.11.43
 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.dist-info → redisbench_admin-0.11.43.dist-info}/RECORD

@@ -211,7 +211,7 @@ redisbench_admin/run_local/local_db.py,sha256=9vINqKOs-wDMFEuEHT0I8KO9YnEo_h4NWN
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
 redisbench_admin/run_local/run_local.py,sha256=QHnGfVAaVuct7t0WrWyQpbirC3MWX7fQF5-kXU_pJBs,34834
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run_remote/args.py,sha256=gJux_1udR6d5BUMMnIewl62hS0b2WnQ_7WQF4hElX7c,5051
+redisbench_admin/run_remote/args.py,sha256=P7azI3m5jJJBovD9rLCvFWjVNveMcu7FVZbEUjdDn0c,4866
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
 redisbench_admin/run_remote/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_remote/notifications.py,sha256=-W9fLaftEFNfplBl2clHk37jbYxliDbHftQ62khN31k,2157
@@ -220,8 +220,8 @@ redisbench_admin/run_remote/remote_db.py,sha256=EEDeiOZk-godr5EINscEkOJLGWUN3gFf
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
 redisbench_admin/run_remote/remote_helpers.py,sha256=skWeGyDJBmyx_UwUekT3N3_nOJvF2-Hvu-E7vKlO9gg,10598
-redisbench_admin/run_remote/run_remote.py,sha256=7B-x-AI1pVon8ccfRio8q6EXTXaqPPMj_PxytpiICUs,76045
-redisbench_admin/run_remote/standalone.py,sha256=Or2GaSccxEyIl0z833RWi-fylSQ71Z6E1R2vbN0rHMM,31593
+redisbench_admin/run_remote/run_remote.py,sha256=VSKPAh-ky8ihwtlx8k2ZTIkF-bV3h40LmZ7A9LvrTsE,76460
+redisbench_admin/run_remote/standalone.py,sha256=TY9kcie3cZEC72ApnZGzHpRu-2oYwnqvvHvpiIQbyMk,32703
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/utils/benchmark_config.py,sha256=bC2C6rnj89wkkSlOXyyfe0N15unn_M1t1zfskfVkb98,21387
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6r
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.42.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.42.dist-info/METADATA,sha256=s_waYOA4L1z-YQOS-p7DPaW8QWK2zzr2rsMSEAIVD7Y,5596
-redisbench_admin-0.11.42.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.42.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.42.dist-info/RECORD,,
+redisbench_admin-0.11.43.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.43.dist-info/METADATA,sha256=UNlX9IOVDskYPuGhnpCSglVyoBBj5PZksnch-G-r5O4,5596
+redisbench_admin-0.11.43.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.43.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.43.dist-info/RECORD,,