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

redisbench_admin/run_remote/args.py

@@ -148,7 +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",
+        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,6 +271,31 @@ 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 from defaults.yml
+        benchmark_config = None
+
+        # 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(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.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(
             server_public_ip=server_public_ip,
@@ -282,6 +308,7 @@ def run_remote_command_logic(args, project_name, project_version):
             modules_configuration_parameters_map=None,
             custom_redis_conf_path=args.redis_conf,
             custom_redis_server_path=args.redis_server_binary,
+            benchmark_config=benchmark_config,
         )
 
         exit(0 if success else 1)

redisbench_admin/run_remote/standalone.py

@@ -457,6 +457,86 @@ 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
+):
+    """
+    Execute install_steps from dbconfig and clientconfig sections.
+
+    Args:
+        benchmark_config: The benchmark configuration dictionary
+        server_public_ip: IP address of the remote server
+        username: SSH username
+        private_key: Path to SSH private key
+        db_ssh_port: SSH port
+    """
+    install_commands = []
+
+    # Extract install_steps from dbconfig
+    if "dbconfig" in benchmark_config:
+        dbconfig = benchmark_config["dbconfig"]
+        if isinstance(dbconfig, list):
+            for config_item in dbconfig:
+                if "install_steps" in config_item:
+                    steps = config_item["install_steps"]
+                    if isinstance(steps, list):
+                        install_commands.extend(steps)
+                        logging.info(f"📦 Found {len(steps)} install steps in dbconfig")
+        elif isinstance(dbconfig, dict):
+            if "install_steps" in dbconfig:
+                steps = dbconfig["install_steps"]
+                if isinstance(steps, list):
+                    install_commands.extend(steps)
+                    logging.info(f"📦 Found {len(steps)} install steps in dbconfig")
+
+    # Extract install_steps from clientconfig
+    if "clientconfig" in benchmark_config:
+        clientconfig = benchmark_config["clientconfig"]
+        if isinstance(clientconfig, list):
+            for config_item in clientconfig:
+                if "install_steps" in config_item:
+                    steps = config_item["install_steps"]
+                    if isinstance(steps, list):
+                        install_commands.extend(steps)
+                        logging.info(
+                            f"📦 Found {len(steps)} install steps in clientconfig"
+                        )
+        elif isinstance(clientconfig, dict):
+            if "install_steps" in clientconfig:
+                steps = clientconfig["install_steps"]
+                if isinstance(steps, list):
+                    install_commands.extend(steps)
+                    logging.info(f"📦 Found {len(steps)} install steps in clientconfig")
+
+    # Execute all install commands
+    if install_commands:
+        logging.info(f"🔧 Executing {len(install_commands)} installation commands...")
+        for i, command in enumerate(install_commands, 1):
+            logging.info(f"📋 Step {i}/{len(install_commands)}: {command}")
+
+        install_result = execute_remote_commands(
+            server_public_ip, username, private_key, install_commands, db_ssh_port
+        )
+
+        # Check results
+        for i, (recv_exit_status, stdout, stderr) in enumerate(install_result):
+            if recv_exit_status != 0:
+                logging.warning(
+                    f"⚠️ Install step {i+1} returned exit code {recv_exit_status}"
+                )
+                logging.warning(f"Command: {install_commands[i]}")
+                if stderr:
+                    logging.warning(f"STDERR: {''.join(stderr).strip()}")
+                if stdout:
+                    logging.warning(f"STDOUT: {''.join(stdout).strip()}")
+            else:
+                logging.info(f"✅ Install step {i+1} completed successfully")
+
+        logging.info("🎯 All installation steps completed")
+    else:
+        logging.info("📦 No install_steps found in configuration")
+
+
 def spin_test_standalone_redis(
     server_public_ip,
     username,
@@ -468,6 +548,7 @@ def spin_test_standalone_redis(
     modules_configuration_parameters_map=None,
     custom_redis_conf_path=None,
     custom_redis_server_path=None,
+    benchmark_config=None,
 ):
     """
     Setup standalone Redis server, run INFO SERVER, print output as markdown and exit.
@@ -494,6 +575,12 @@ def spin_test_standalone_redis(
             server_public_ip, username, private_key, create_dir_commands, db_ssh_port
         )
 
+        # Execute install_steps from dbconfig and clientconfig if present
+        if benchmark_config is not None:
+            execute_install_steps(
+                benchmark_config, server_public_ip, username, private_key, db_ssh_port
+            )
+
         # Ensure Redis server is available (only if not using custom binary)
         if custom_redis_server_path is None:
             ensure_redis_server_available(
@@ -509,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}"
@@ -516,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,
@@ -532,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}"
@@ -541,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,
@@ -570,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
@@ -597,7 +704,14 @@ def spin_test_standalone_redis(
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"
-        full_logfile, redis_cmd = generate_remote_standalone_redis_cmd(
+
+        # 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,
             remote_module_files,
@@ -689,8 +803,8 @@ def spin_test_standalone_redis(
             "Disk Space",
         ]
 
-        for i, (label, (recv_exit_status, stdout, stderr)) in enumerate(
-            zip(system_labels, system_results)
+        for label, (recv_exit_status, stdout, stderr) in zip(
+            system_labels, system_results
         ):
             if recv_exit_status == 0 and stdout:
                 output = "".join(stdout).strip()

{redisbench_admin-0.11.41.dist-info → redisbench_admin-0.11.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.11.41
+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.41.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=Ef32mg1yNYYHL5g59SzIWZqFB__RNLLriPqiucVyoNg,4826
+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=tZqCu1fTfB5gWooVIEsSDoaVfnVRfxeCpn-RLmYI3IM,75476
-redisbench_admin/run_remote/standalone.py,sha256=OGau_7MpQihbn0U4qa0QmGZnwQ_gJhuxuWiQm9zpp7M,27970
+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.41.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.41.dist-info/METADATA,sha256=doOixz08d09LZGCuGz9OsIuNdcP_1fYqxaiLwUacBCY,5596
-redisbench_admin-0.11.41.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.41.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.41.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,,