redisbench-admin 0.11.50__py3-none-any.whl → 0.11.52__py3-none-any.whl

redisbench_admin/run/args.py

@@ -23,6 +23,7 @@ DEFAULT_TRIGGERING_ENV = socket.gethostname()
 TRIGGERING_ENV = os.getenv("TRIGGERING_ENV", DEFAULT_TRIGGERING_ENV)
 ENV = os.getenv("ENV", "oss-standalone,oss-cluster")
 SETUP = os.getenv("SETUP", "")
+BENCHMARK = os.getenv("BENCHMARK", "")
 BENCHMARK_GLOB = os.getenv("BENCHMARK_GLOB", "*.yml")
 BENCHMARK_REGEX = os.getenv("BENCHMARK_REGEX", ".*")
 BENCHMARK_RUNNER_GROUP_TOTAL = int(os.getenv("BENCHMARK_RUNNER_GROUP_TOTAL", "1"))
@@ -94,7 +95,7 @@ def common_run_args(parser):
     parser.add_argument(
         "--test",
         type=str,
-        default="",
+        default=BENCHMARK,
         help="specify a test to run. By default will run all of them.",
     )
     parser.add_argument(

redisbench_admin/run/modules.py

@@ -48,90 +48,3 @@ def exists_check(error_message, local_module_file, status):
             "Confirmed that module artifact: '{}' exists!".format(local_module_file)
         )
     return error_message, status
-
-
-def redis_files_check(redis_server_binary_path, redis_conf_path):
-    """
-    Check if custom Redis server binary and config file paths exist.
-
-    Args:
-        redis_server_binary_path: Path to custom redis-server binary (can be None)
-        redis_conf_path: Path to custom redis.conf file (can be None)
-
-    Returns:
-        tuple: (status, error_message) where status is True if all files exist
-    """
-    status = True
-    error_message = ""
-
-    if redis_server_binary_path is not None:
-        # Convert relative paths to absolute paths
-        redis_server_binary_path = os.path.abspath(
-            os.path.expanduser(redis_server_binary_path)
-        )
-        logging.info(
-            "Checking if custom Redis server binary {} exists...".format(
-                redis_server_binary_path
-            )
-        )
-        if not os.path.exists(redis_server_binary_path):
-            error_message = "Specified Redis server binary does not exist: {}".format(
-                redis_server_binary_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.path.isfile(redis_server_binary_path):
-            error_message = (
-                "Specified Redis server binary path is not a file: {}".format(
-                    redis_server_binary_path
-                )
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.access(redis_server_binary_path, os.X_OK):
-            error_message = (
-                "Specified Redis server binary is not executable: {}".format(
-                    redis_server_binary_path
-                )
-            )
-            logging.error(error_message)
-            status = False
-        else:
-            logging.info(
-                "✅ Confirmed that Redis server binary: '{}' exists and is executable!".format(
-                    redis_server_binary_path
-                )
-            )
-
-    if redis_conf_path is not None:
-        # Convert relative paths to absolute paths
-        redis_conf_path = os.path.abspath(os.path.expanduser(redis_conf_path))
-        logging.info(
-            "Checking if custom Redis config file {} exists...".format(redis_conf_path)
-        )
-        if not os.path.exists(redis_conf_path):
-            error_message = "Specified Redis config file does not exist: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.path.isfile(redis_conf_path):
-            error_message = "Specified Redis config file path is not a file: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        elif not os.access(redis_conf_path, os.R_OK):
-            error_message = "Specified Redis config file is not readable: {}".format(
-                redis_conf_path
-            )
-            logging.error(error_message)
-            status = False
-        else:
-            logging.info(
-                "✅ Confirmed that Redis config file: '{}' exists and is readable!".format(
-                    redis_conf_path
-                )
-            )
-
-    return status, error_message

redisbench_admin/run/run.py

@@ -117,6 +117,15 @@ def define_benchmark_plan(benchmark_definitions, default_specs):
                         test_benchmark_config["dbconfig"] = {}
                     setup_dbconfig = setup_settings["dbconfig"]
                     benchmark_dbconfig = test_benchmark_config["dbconfig"]
+
+                    # Handle legacy list format - convert to dict by merging all entries
+                    if isinstance(benchmark_dbconfig, list):
+                        converted_dbconfig = {}
+                        for entry in benchmark_dbconfig:
+                            if isinstance(entry, dict):
+                                converted_dbconfig.update(entry)
+                        benchmark_dbconfig = converted_dbconfig
+
                     logging.info(
                         f"Merging setup dbconfig: {setup_dbconfig}, with benchmark dbconfig {test_benchmark_config}"
                     )

redisbench_admin/run_async/benchmark.py

@@ -41,7 +41,6 @@ class BenchmarkClass:
             self.exporter_timemetric_path,
             self.default_specs,
             self.clusterconfig,
-            _,
         ) = prepare_benchmark_definitions(args)
 
     def populate_remote_envs_timeout(self):

redisbench_admin/run_local/run_local.py

@@ -149,7 +149,6 @@ def run_local_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0
@@ -308,9 +307,10 @@ def run_local_command_logic(args, project_name, project_version):
                                     None,
                                     args.password,
                                 )
+                                # get the pids
                                 redis_pids = [
-                                    redis_process.pid
-                                    for redis_process in redis_processes
+                                    redis_conn.info("server")["process_id"]
+                                    for redis_conn in redis_conns
                                 ]
                                 # start the profile
                                 (
@@ -557,6 +557,14 @@ def run_local_command_logic(args, project_name, project_version):
                                             "Keeping environment and topology active upon request."
                                         )
 
+                            except KeyboardInterrupt:
+                                logging.critical(
+                                    "Detected Keyboard interrupt...Tearing down and exiting!"
+                                )
+                                teardown_local_setup(
+                                    redis_conns, redis_processes, setup_name
+                                )
+                                exit(1)
                             except:
                                 return_code |= 1
                                 logging.critical(

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 (reads install_steps from defaults.yml)",
+        help="Setup standalone Redis server, run INFO SERVER, print output as markdown and exit",
     )
 
     return parser

redisbench_admin/run_remote/remote_db.py

@@ -105,8 +105,6 @@ 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,
 ):
     (
         _,
@@ -116,116 +114,6 @@ 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
-        )
-
-    # Copy custom Redis files to remote host if provided
-    remote_redis_server_path = None
-    remote_redis_conf_path = None
-
-    if custom_redis_server_path or custom_redis_conf_path:
-        from redisbench_admin.utils.remote import copy_file_to_remote_setup
-        import os
-
-        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}"
-                )
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            remote_redis_conf_path = "/tmp/redis.conf"
-            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,
-                username,
-                private_key,
-                custom_redis_conf_path,
-                remote_redis_conf_path,
-                None,
-                db_ssh_port,
-                False,  # don't continue on error
-            )
-
-            if not copy_result:
-                logging.error("❌ Failed to copy redis.conf to remote host")
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-            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}"
-                )
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            remote_redis_server_path = "/tmp/redis-server"
-            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,
-                username,
-                private_key,
-                custom_redis_server_path,
-                remote_redis_server_path,
-                None,
-                db_ssh_port,
-                False,  # don't continue on error
-            )
-
-            if not copy_result:
-                logging.error("❌ Failed to copy redis-server binary to remote host")
-                return_code = 1
-                return (None, None, None, [], [], return_code, None, None)
-
-            # Make the binary executable
-            chmod_commands = [f"chmod +x {remote_redis_server_path}"]
-            chmod_results = execute_remote_commands(
-                server_public_ip, username, private_key, chmod_commands, db_ssh_port
-            )
-
-            recv_exit_status, stdout, stderr = chmod_results[0]
-            if recv_exit_status != 0:
-                logging.warning(
-                    f"⚠️ Failed to make redis-server binary executable: {stderr}"
-                )
-            else:
-                logging.info(
-                    f"✅ Successfully copied and made executable: {remote_redis_server_path}"
-                )
-
-    # Update the custom paths to use the remote paths
-    if remote_redis_server_path:
-        custom_redis_server_path = remote_redis_server_path
-    if remote_redis_conf_path:
-        custom_redis_conf_path = remote_redis_conf_path
-
     full_logfiles = []
     cluster_enabled = False
     if setup_type == "oss-cluster":
@@ -319,8 +207,6 @@ 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/run_remote/run_remote.py

@@ -4,7 +4,6 @@
 #  All rights reserved.
 #
 import logging
-import os
 import random
 import string
 import sys
@@ -35,7 +34,7 @@ from redisbench_admin.run.common import (
 )
 from redisbench_admin.run.git import git_vars_crosscheck
 from redisbench_admin.run.grafana import generate_artifacts_table_grafana_redis
-from redisbench_admin.run.modules import redis_modules_check, redis_files_check
+from redisbench_admin.run.modules import redis_modules_check
 from redisbench_admin.run.redistimeseries import (
     timeseries_test_sucess_flow,
     timeseries_test_failure_flow,
@@ -229,25 +228,6 @@ def run_remote_command_logic(args, project_name, project_version):
                 )
             )
 
-    # Validate Redis server binary and config file paths early
-    redis_files_check_status, redis_error_message = redis_files_check(
-        args.redis_server_binary, args.redis_conf
-    )
-    if redis_files_check_status is False:
-        if webhook_notifications_active:
-            failure_reason = redis_error_message
-            generate_failure_notification(
-                webhook_client_slack,
-                ci_job_name,
-                ci_job_link,
-                failure_reason,
-                tf_github_org,
-                tf_github_repo,
-                tf_github_branch,
-                None,
-            )
-        exit(1)
-
     common_properties_log(
         tf_bin_path,
         tf_github_actor,
@@ -290,31 +270,6 @@ 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,
@@ -327,7 +282,6 @@ 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)
@@ -339,7 +293,6 @@ def run_remote_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
-        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0
@@ -685,8 +638,6 @@ 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/run_remote/standalone.py

@@ -13,6 +13,7 @@ from redisbench_admin.utils.remote import (
 )
 from redisbench_admin.utils.ssh import SSHSession
 from redisbench_admin.utils.utils import redis_server_config_module_part
+import tempfile
 
 
 def ensure_redis_server_available(server_public_ip, username, private_key, port=22):
@@ -276,22 +277,9 @@ 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 (only if not using custom binary)
-    if custom_redis_server_path is None:
-        ensure_redis_server_available(server_public_ip, username, private_key, port)
-    else:
-        logging.info(
-            "🔧 Using custom Redis binary - skipping system Redis installation"
-        )
-
-    # Log what paths we're using
-    logging.info("🔧 Redis command generation:")
-    logging.info(f"   - Custom server path: {custom_redis_server_path}")
-    logging.info(f"   - Custom config path: {custom_redis_conf_path}")
-    logging.info(f"   - Module files: {remote_module_files}")
+    # Ensure redis-server is available before trying to start it
+    ensure_redis_server_available(server_public_ip, username, private_key, port)
 
     full_logfile, initial_redis_cmd = generate_remote_standalone_redis_cmd(
         logfile,
@@ -300,8 +288,6 @@ 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
@@ -471,86 +457,6 @@ 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,
@@ -562,7 +468,6 @@ 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.
@@ -589,12 +494,6 @@ 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(
@@ -610,21 +509,14 @@ 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}"
                 )
                 return False
 
-            remote_redis_conf_path = "/tmp/redis.conf"
-            logging.info(
-                f"📁 Copying custom redis.conf from {custom_redis_conf_path} to {remote_redis_conf_path}"
-            )
+            remote_redis_conf_path = f"{temporary_dir}/redis.conf"
+            logging.info(f"📁 Copying custom redis.conf to remote host...")
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -640,27 +532,16 @@ 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}"
                 )
                 return False
 
-            remote_redis_server_path = "/tmp/redis-server"
-            logging.info(
-                f"📁 Copying custom redis-server binary from {custom_redis_server_path} to {remote_redis_server_path}"
-            )
+            remote_redis_server_path = f"{temporary_dir}/redis-server"
+            logging.info(f"📁 Copying custom redis-server binary to remote host...")
 
             copy_result = copy_file_to_remote_setup(
                 server_public_ip,
@@ -689,9 +570,7 @@ def spin_test_standalone_redis(
                     f"⚠️ Failed to make redis-server binary executable: {stderr}"
                 )
             else:
-                logging.info(
-                    f"✅ Successfully copied and made executable: {remote_redis_server_path}"
-                )
+                logging.info("✅ Redis-server binary made executable")
 
         # Copy modules if provided
         remote_module_files = None
@@ -718,14 +597,7 @@ def spin_test_standalone_redis(
 
         # Generate Redis startup command
         logfile = "redis-spin-test.log"
-
-        # Log what paths we're using
-        logging.info("🔧 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(
+        full_logfile, redis_cmd = generate_remote_standalone_redis_cmd(
             logfile,
             redis_configuration_parameters,
             remote_module_files,
@@ -817,8 +689,8 @@ def spin_test_standalone_redis(
             "Disk Space",
         ]
 
-        for label, (recv_exit_status, stdout, stderr) in zip(
-            system_labels, system_results
+        for i, (label, (recv_exit_status, stdout, stderr)) in enumerate(
+            zip(system_labels, system_results)
         ):
             if recv_exit_status == 0 and stdout:
                 output = "".join(stdout).strip()