redisbench-admin 0.11.68__tar.gz → 0.11.70__tar.gz

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redisbench-admin
-Version: 0.11.68
+Version: 0.11.70
 Summary: Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... ).
 License-File: LICENSE
 Author: filipecosta90

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.68"
+version = "0.11.70"
 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.68 → redisbench_admin-0.11.70}/redisbench_admin/run/cluster.py

@@ -4,8 +4,10 @@
 #  All rights reserved.
 #
 import logging
+import os
 
-from redisbench_admin.utils.remote import execute_remote_commands
+from redisbench_admin.run_remote.consts import remote_module_file_dir
+from redisbench_admin.utils.remote import copy_file_to_remote_setup, execute_remote_commands
 
 from redisbench_admin.environments.oss_cluster import generate_cluster_redis_server_args
 from redisbench_admin.utils.utils import wait_for_conn
@@ -116,6 +118,7 @@ def spin_up_redis_cluster_remote_redis(
     redis_7=True,
     remote_symlinks=None,
     ld_library_paths=None,
+    custom_redis_server_path=None,
 ):
     # Import the functions from standalone module
     from redisbench_admin.run_remote.standalone import (
@@ -124,8 +127,46 @@ def spin_up_redis_cluster_remote_redis(
         build_ld_library_path_prefix,
     )
 
-    # Ensure redis-server is available before trying to start cluster
-    ensure_redis_server_available(server_public_ip, username, private_key, ssh_port)
+    # Handle custom redis-server binary
+    remote_redis_server_path = None
+    if 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}"
+            )
+            raise Exception(
+                f"Custom redis-server binary not found: {custom_redis_server_path}"
+            )
+
+        remote_redis_server_path = f"{remote_module_file_dir}/redis-server"
+        logging.info(
+            f"Copying custom redis-server binary to remote host: {custom_redis_server_path} -> {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,
+            ssh_port,
+            False,  # don't continue on error
+        )
+
+        if not copy_result:
+            logging.error("Failed to copy redis-server binary to remote host")
+            raise Exception("Failed to copy redis-server binary to remote host")
+
+        # Make the binary executable
+        chmod_commands = [f"chmod +x {remote_redis_server_path}"]
+        execute_remote_commands(
+            server_public_ip, username, private_key, chmod_commands, ssh_port
+        )
+        logging.info("Custom redis-server binary copied and made executable")
+    else:
+        # Ensure redis-server is available before trying to start cluster (only if not using custom binary)
+        ensure_redis_server_available(server_public_ip, username, private_key, ssh_port)
 
     # Setup symlinks on remote server if specified
     if remote_symlinks:
@@ -140,6 +181,9 @@ def spin_up_redis_cluster_remote_redis(
     if ld_prefix:
         logging.info(f"Using LD_LIBRARY_PATH prefix: {ld_prefix}")
 
+    # Determine which redis-server binary to use
+    redis_server_binary = remote_redis_server_path if remote_redis_server_path else "redis-server"
+
     logging.info("Generating the remote redis-server command arguments")
     redis_process_commands = []
     logfiles = []
@@ -148,7 +192,7 @@ def spin_up_redis_cluster_remote_redis(
         shard_port = master_shard_id + start_port - 1
 
         command, logfile = generate_cluster_redis_server_args(
-            "redis-server",
+            redis_server_binary,
             dbdir_folder,
             remote_module_files,
             server_private_ip,

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/redisbench_admin/run_remote/remote_db.py

@@ -108,6 +108,7 @@ def remote_db_spin(
     remote_symlinks=None,
     ld_library_paths=None,
     extra_libs=None,
+    custom_redis_server_path=None,
 ):
     (
         _,
@@ -180,6 +181,7 @@ def remote_db_spin(
                 redis_7,
                 remote_symlinks,
                 ld_library_paths,
+                custom_redis_server_path,
             )
         try:
             for p in range(cluster_start_port, cluster_start_port + shard_count):
@@ -232,6 +234,7 @@ def remote_db_spin(
                     redis_7,
                     remote_symlinks,
                     ld_library_paths,
+                    custom_redis_server_path,
                 )
                 full_logfiles.append(full_logfile)
             local_redis_conn, ssh_tunnel = ssh_tunnel_redisconn(

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/redisbench_admin/run_remote/run_remote.py

@@ -155,6 +155,7 @@ def run_remote_command_logic(args, project_name, project_version):
     remote_symlinks = args.remote_symlink
     ld_library_paths = args.ld_library_path
     extra_libs = args.extra_lib
+    custom_redis_server_path = args.redis_server_binary
     if WH_TOKEN is not None:
         webhook_notifications_active = True
 
@@ -666,6 +667,7 @@ def run_remote_command_logic(args, project_name, project_version):
                                             remote_symlinks,
                                             ld_library_paths,
                                             extra_libs,
+                                            custom_redis_server_path,
                                         )
                                         if benchmark_type == "read-only" or reuse_mixed:
                                             ro_benchmark_set(

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/redisbench_admin/run_remote/standalone.py

@@ -7,6 +7,7 @@
 import logging
 import os
 
+from redisbench_admin.run_remote.consts import remote_module_file_dir
 from redisbench_admin.utils.remote import (
     copy_file_to_remote_setup,
     execute_remote_commands,
@@ -350,9 +351,48 @@ def spin_up_standalone_remote_redis(
     redis_7=True,
     remote_symlinks=None,
     ld_library_paths=None,
+    custom_redis_server_path=None,
 ):
-    # Ensure redis-server is available before trying to start it
-    ensure_redis_server_available(server_public_ip, username, private_key, port)
+    # Handle custom redis-server binary
+    remote_redis_server_path = None
+    if 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}"
+            )
+            raise Exception(
+                f"Custom redis-server binary not found: {custom_redis_server_path}"
+            )
+
+        remote_redis_server_path = f"{remote_module_file_dir}/redis-server"
+        logging.info(
+            f"Copying custom redis-server binary to remote host: {custom_redis_server_path} -> {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,
+            port,
+            False,  # don't continue on error
+        )
+
+        if not copy_result:
+            logging.error("Failed to copy redis-server binary to remote host")
+            raise Exception("Failed to copy redis-server binary to remote host")
+
+        # Make the binary executable
+        chmod_commands = [f"chmod +x {remote_redis_server_path}"]
+        execute_remote_commands(
+            server_public_ip, username, private_key, chmod_commands, port
+        )
+        logging.info("Custom redis-server binary copied and made executable")
+    else:
+        # Ensure redis-server is available before trying to start it (only if not using custom binary)
+        ensure_redis_server_available(server_public_ip, username, private_key, port)
 
     # Setup symlinks on remote server if specified
     if remote_symlinks:
@@ -362,6 +402,7 @@ def spin_up_standalone_remote_redis(
         if not symlink_success:
             logging.warning("Some symlinks failed to create, continuing anyway...")
 
+    logging.info("Generating Redis startup comman with custom redis-server path: {remote_redis_server_path}")
     full_logfile, initial_redis_cmd = generate_remote_standalone_redis_cmd(
         logfile,
         redis_configuration_parameters,
@@ -369,6 +410,7 @@ def spin_up_standalone_remote_redis(
         temporary_dir,
         modules_configuration_parameters_map,
         redis_7,
+        custom_redis_server_path=remote_redis_server_path,
     )
 
     # Prepend LD_LIBRARY_PATH if specified

{redisbench_admin-0.11.68 → redisbench_admin-0.11.70}/redisbench_admin/utils/utils.py

@@ -112,6 +112,22 @@ def generate_common_server_args(
             ]
         )
 
+    # Add BigRedis configuration if enabled via environment variable
+    if os.getenv("BIGREDIS_ENABLED") is not None:
+        bigredis_path = os.getenv("BIGREDIS_PATH", "/tmp/bigredis")
+        bigredis_use_async = os.getenv("BIGREDIS_USE_ASYNC", "no")
+        logging.info(f"BigRedis enabled. Using bigredis-path: {bigredis_path}")
+        command.extend(
+            [
+                "--bigredis-enabled",
+                "yes",
+                "--bigredis-driver",
+                "speedb",
+                "--bigredis-use-async",
+                bigredis_use_async,  # Temporary default no, until async API is added to Speedb Rust crate.
+            ]
+        )
+
     return command