redisbench-admin 0.11.46__tar.gz → 0.11.48__tar.gz

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.46"
+version = "0.11.48"
 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.46 → redisbench_admin-0.11.48}/redisbench_admin/export/export.py

@@ -76,6 +76,7 @@ def export_command_logic(args, project_name, project_version):
                 exporter_timemetric_path,
                 _,
                 _,
+                _,
             ) = get_defaults(exporter_spec_file)
     arch = args.architecture
     logging.info("Using the following architecture on the timeseries: {}".format(arch))

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/run_async/benchmark.py

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

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/run_local/run_local.py

@@ -149,6 +149,7 @@ def run_local_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
+        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/run_remote/remote_db.py

@@ -124,6 +124,108 @@ def remote_db_spin(
             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.46 → redisbench_admin-0.11.48}/redisbench_admin/run_remote/run_remote.py

@@ -320,6 +320,7 @@ def run_remote_command_logic(args, project_name, project_version):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
+        _,
     ) = prepare_benchmark_definitions(args)
 
     return_code = 0

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/run_remote/standalone.py

@@ -13,7 +13,6 @@ 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):
@@ -280,8 +279,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("🔧 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 +621,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 +657,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}"
             )
@@ -710,7 +720,7 @@ def spin_test_standalone_redis(
         logfile = "redis-spin-test.log"
 
         # Log what paths we're using
-        logging.info(f"🔧 Redis command generation:")
+        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}")

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/utils/benchmark_config.py

@@ -92,6 +92,7 @@ def prepare_benchmark_definitions(args):
         exporter_timemetric_path,
         default_specs,
         clusterconfig,
+        default_dbconfig,
     )
 
 

{redisbench_admin-0.11.46 → redisbench_admin-0.11.48}/redisbench_admin/utils/remote.py

@@ -57,8 +57,42 @@ def get_git_root(path):
 
 def view_bar_simple(a, b):
     res = a / int(b) * 100
-    sys.stdout.write("\r    Complete percent: %.2f %%" % res)
-    sys.stdout.flush()
+    # Only update progress every 5% to reduce output frequency
+    if not hasattr(view_bar_simple, 'last_percent'):
+        view_bar_simple.last_percent = 0
+
+    if res - view_bar_simple.last_percent >= 5.0 or res >= 100.0:
+        sys.stdout.write("\r    Complete percent: %.2f %%" % res)
+        sys.stdout.flush()
+        view_bar_simple.last_percent = res
+
+
+class ProgressCallback:
+    """A more configurable progress callback for file transfers"""
+
+    def __init__(self, update_threshold=5.0, show_bytes=False):
+        """
+        Args:
+            update_threshold: Minimum percentage change before showing update (default: 5.0%)
+            show_bytes: Whether to show bytes transferred (default: False)
+        """
+        self.last_percent = 0
+        self.update_threshold = update_threshold
+        self.show_bytes = show_bytes
+
+    def __call__(self, transferred, total):
+        percent = (transferred / total) * 100
+
+        if (percent - self.last_percent >= self.update_threshold or
+            percent >= 100.0 or
+            self.last_percent == 0):
+
+            if self.show_bytes:
+                sys.stdout.write(f"\r    Progress: {percent:.1f}% ({transferred}/{total} bytes)")
+            else:
+                sys.stdout.write(f"\r    Complete percent: {percent:.2f}%%")
+            sys.stdout.flush()
+            self.last_percent = percent
 
 
 def copy_file_to_remote_setup(