redisbench-admin 0.11.45__tar.gz → 0.11.47__tar.gz

{redisbench_admin-0.11.45 → redisbench_admin-0.11.47}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.45"
+version = "0.11.47"
 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.45 → redisbench_admin-0.11.47}/redisbench_admin/run_remote/remote_db.py

@@ -118,11 +118,114 @@ def remote_db_spin(
 
     # 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":

{redisbench_admin-0.11.45 → redisbench_admin-0.11.47}/redisbench_admin/run_remote/standalone.py

@@ -280,8 +280,19 @@ def spin_up_standalone_remote_redis(
     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)
+    # 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(f"🔧 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}")
 
     full_logfile, initial_redis_cmd = generate_remote_standalone_redis_cmd(
         logfile,
@@ -611,7 +622,7 @@ def spin_test_standalone_redis(
                 )
                 return False
 
-            remote_redis_conf_path = f"{temporary_dir}/redis.conf"
+            remote_redis_conf_path = "/tmp/redis.conf"
             logging.info(
                 f"📁 Copying custom redis.conf from {custom_redis_conf_path} to {remote_redis_conf_path}"
             )
@@ -647,7 +658,7 @@ def spin_test_standalone_redis(
                 )
                 return False
 
-            remote_redis_server_path = f"{temporary_dir}/redis-server"
+            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}"
             )

{redisbench_admin-0.11.45 → redisbench_admin-0.11.47}/redisbench_admin/utils/benchmark_config.py

@@ -150,7 +150,9 @@ def get_defaults(defaults_filename):
     )
 
 
-def get_final_benchmark_config(default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None):
+def get_final_benchmark_config(
+    default_kpis, default_remote, stream, usecase_filename, default_dbconfig=None
+):
     result = False
     benchmark_config = None
     test_name = None