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

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

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

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

@@ -150,5 +150,12 @@ def create_run_remote_arguments(parser):
         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)",
+    )
 
     return parser

{redisbench_admin-0.11.41 → redisbench_admin-0.11.42}/redisbench_admin/run_remote/run_remote.py

@@ -270,6 +270,18 @@ 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
+        benchmark_config = None
+        if args.spin_test_config:
+            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}")
+            except Exception as e:
+                logging.error(f"❌ Failed to load benchmark config: {e}")
+                exit(1)
+
         # Run spin test
         success = spin_test_standalone_redis(
             server_public_ip=server_public_ip,
@@ -282,6 +294,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-0.11.41 → redisbench_admin-0.11.42}/redisbench_admin/run_remote/standalone.py

@@ -457,6 +457,82 @@ 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 +544,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 +571,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(
@@ -597,7 +680,7 @@ def spin_test_standalone_redis(
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"
-        full_logfile, redis_cmd = generate_remote_standalone_redis_cmd(
+        _, redis_cmd = generate_remote_standalone_redis_cmd(
             logfile,
             redis_configuration_parameters,
             remote_module_files,
@@ -689,8 +772,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()