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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.11.47"
+version = "0.11.49"
 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.47 → redisbench_admin-0.11.49}/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.49/redisbench_admin/run/modules.py

@@ -0,0 +1,129 @@
+#  BSD 3-Clause License
+#
+#  Copyright (c) 2021., Redis Labs Modules
+#  All rights reserved.
+#
+import logging
+import os
+
+
+def redis_modules_check(local_module_files):
+    status = True
+    error_message = ""
+    if local_module_files is not None:
+        logging.info(
+            "Using the following module artifacts: {}".format(local_module_files)
+        )
+        for local_module_file in local_module_files:
+            if type(local_module_file) is str:
+                logging.info(
+                    "Checking if module artifact {} exists...".format(local_module_file)
+                )
+                error_message, status = exists_check(
+                    error_message, local_module_file, status
+                )
+            if type(local_module_file) is list:
+                for inner_local_module_file in local_module_file:
+                    logging.info(
+                        "Checking if module artifact {} exists...".format(
+                            inner_local_module_file
+                        )
+                    )
+                    error_message, status = exists_check(
+                        error_message, inner_local_module_file, status
+                    )
+
+    return status, error_message
+
+
+def exists_check(error_message, local_module_file, status):
+    if os.path.exists(local_module_file) is False:
+        error_message = "Specified module artifact does not exist: {}".format(
+            local_module_file
+        )
+        logging.error(error_message)
+        status = False
+    else:
+        logging.info(
+            "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-0.11.47 → redisbench_admin-0.11.49}/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.47 → redisbench_admin-0.11.49}/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.47 → redisbench_admin-0.11.49}/redisbench_admin/run_remote/run_remote.py

@@ -35,7 +35,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
+from redisbench_admin.run.modules import redis_modules_check, redis_files_check
 from redisbench_admin.run.redistimeseries import (
     timeseries_test_sucess_flow,
     timeseries_test_failure_flow,
@@ -229,6 +229,25 @@ 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,
@@ -320,6 +339,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.47 → redisbench_admin-0.11.49}/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):
@@ -289,7 +288,7 @@ def spin_up_standalone_remote_redis(
         )
 
     # Log what paths we're using
-    logging.info(f"🔧 Redis command generation:")
+    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}")
@@ -721,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.47 → redisbench_admin-0.11.49}/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.47 → redisbench_admin-0.11.49}/redisbench_admin/utils/remote.py

@@ -57,8 +57,46 @@ 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(

redisbench_admin-0.11.47/redisbench_admin/run/modules.py

@@ -1,50 +0,0 @@
-#  BSD 3-Clause License
-#
-#  Copyright (c) 2021., Redis Labs Modules
-#  All rights reserved.
-#
-import logging
-import os
-
-
-def redis_modules_check(local_module_files):
-    status = True
-    error_message = ""
-    if local_module_files is not None:
-        logging.info(
-            "Using the following module artifacts: {}".format(local_module_files)
-        )
-        for local_module_file in local_module_files:
-            if type(local_module_file) is str:
-                logging.info(
-                    "Checking if module artifact {} exists...".format(local_module_file)
-                )
-                error_message, status = exists_check(
-                    error_message, local_module_file, status
-                )
-            if type(local_module_file) is list:
-                for inner_local_module_file in local_module_file:
-                    logging.info(
-                        "Checking if module artifact {} exists...".format(
-                            inner_local_module_file
-                        )
-                    )
-                    error_message, status = exists_check(
-                        error_message, inner_local_module_file, status
-                    )
-
-    return status, error_message
-
-
-def exists_check(error_message, local_module_file, status):
-    if os.path.exists(local_module_file) is False:
-        error_message = "Specified module artifact does not exist: {}".format(
-            local_module_file
-        )
-        logging.error(error_message)
-        status = False
-    else:
-        logging.info(
-            "Confirmed that module artifact: '{}' exists!".format(local_module_file)
-        )
-    return error_message, status