redisbench-admin 0.11.47__py3-none-any.whl → 0.11.49__py3-none-any.whl

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/run/modules.py

@@ -48,3 +48,82 @@ 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_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/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/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/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/utils/benchmark_config.py

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

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.dist-info → redisbench_admin-0.11.49.dist-info}/METADATA

@@ -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.dist-info → redisbench_admin-0.11.49.dist-info}/RECORD

@@ -15,7 +15,7 @@ redisbench_admin/export/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8z
 redisbench_admin/export/args.py,sha256=v_WjJCNz_LeIFMNwSN6XwRmvSx1K2ys8XS1gK50EM_4,3508
 redisbench_admin/export/common/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/common/common.py,sha256=LnvXjMLlJRzMTxiFIjrfRFfDx9JJm88OZHu7lnTOpFA,4331
-redisbench_admin/export/export.py,sha256=u00NjaCbWhCJ319leVlP4ZkqiqZt5FN4Gbag4Poo23M,11274
+redisbench_admin/export/export.py,sha256=E_suYdkQopVn6HGYMUGl0OvzKlaWcQbemFzdFxSwKy4,11293
 redisbench_admin/export/google_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/export/google_benchmark/google_benchmark_json_format.py,sha256=OuMaMmmma5VvXA0rcLIQSMxIq81oa5I3xYDFhbWj-IA,1804
 redisbench_admin/export/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -184,7 +184,7 @@ redisbench_admin/run/grafana.py,sha256=iMDgMyJKinpZMTD43rZ1IcRGkadjFjCxaB48mYWkv
 redisbench_admin/run/memtier_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/memtier_benchmark/memtier_benchmark.py,sha256=wTd2olovvFBZ98mOSr6DM5BJsdaiuPteEZzBqeSgbkE,4246
 redisbench_admin/run/metrics.py,sha256=8EQdcZbCiFB_kIR1WtUQNOPV8y74bZ8Dj51Cv0aR4nk,7556
-redisbench_admin/run/modules.py,sha256=9To85oDw2tmUNmTDxOgvKls_46oZRcd2cCt6xNjIWiA,1691
+redisbench_admin/run/modules.py,sha256=ZMV8IKJAzkSqxIk8vDQq-sOYn2fE1Que6w7I9D4P9xQ,4773
 redisbench_admin/run/redis_benchmark/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/redis_benchmark/redis_benchmark.py,sha256=e-Az2uTlt3z2W4uzlUsdxeT8GITpxpGb-Mjb6JxrSWc,6848
 redisbench_admin/run/redisgraph_benchmark_go/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
@@ -200,7 +200,7 @@ redisbench_admin/run/ycsb/ycsb.py,sha256=cs5saVH7C4YpDvzhoa15PwEho59qTVR1E90v_FY
 redisbench_admin/run_async/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_async/async_env.py,sha256=tE1turaaZNHfOaSpGxh62EJWp88zoQFUf3sMbaS7JRA,2408
 redisbench_admin/run_async/async_terraform.py,sha256=ngOQnECUuC20pZwiJItaiBnzlwT2DiKciPTHtqLURe4,11299
-redisbench_admin/run_async/benchmark.py,sha256=S-dsaWGjgsPQxj8sXAACnbtNw5zlJnRFoo53ULbrMEY,1630
+redisbench_admin/run_async/benchmark.py,sha256=ea1V_lNYzsa4EXbh0_Ecsf3IFPlnNzo29Pdho35BgLg,1645
 redisbench_admin/run_async/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/run_async/render_files.py,sha256=NMagmx-2hsMET_XN8tkmQz55g-azqW7SjAqaq4GL8F0,2676
 redisbench_admin/run_async/run_async.py,sha256=g2ZOQqj9vXZYaRyNpJZtgfYyY9tMuRmEv3Hh3qWOUs8,14525
@@ -209,7 +209,7 @@ redisbench_admin/run_local/args.py,sha256=LPpqtx1cH1dkkeHjYlaFnAp_TijxnzPZFO2CmY
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
 redisbench_admin/run_local/local_db.py,sha256=9vINqKOs-wDMFEuEHT0I8KO9YnEo_h4NWNk5da3LwSY,7518
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=QHnGfVAaVuct7t0WrWyQpbirC3MWX7fQF5-kXU_pJBs,34834
+redisbench_admin/run_local/run_local.py,sha256=OrzfzCvOcQ1JLGfNZcChE1SsQCUDMHctzOHNF6a-xtA,34845
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_remote/args.py,sha256=P7azI3m5jJJBovD9rLCvFWjVNveMcu7FVZbEUjdDn0c,4866
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
@@ -220,23 +220,23 @@ redisbench_admin/run_remote/remote_db.py,sha256=VNsJmJf7803gsCd_lhwCb37V-xd_mC25
 redisbench_admin/run_remote/remote_env.py,sha256=Ux_0QT1unNRlKl3cakzjG5Px1uuxOOfBoF_pnalx_T8,4936
 redisbench_admin/run_remote/remote_failures.py,sha256=IOo6DyxarcwwMPCeN4gWB2JrhuC9iBLwq0nCROqr5ak,1567
 redisbench_admin/run_remote/remote_helpers.py,sha256=skWeGyDJBmyx_UwUekT3N3_nOJvF2-Hvu-E7vKlO9gg,10598
-redisbench_admin/run_remote/run_remote.py,sha256=dAR2HRA6pl4jFdRM6YF1iAsLfuy1TZ8nn3s6QdOdv2k,76591
-redisbench_admin/run_remote/standalone.py,sha256=r7Obzvu_ZE_j1uUc1HdVbYBIHHgZBHqt9ApaEUXDw3w,33356
+redisbench_admin/run_remote/run_remote.py,sha256=c5utaihKGY42nBTPFraIkW0yYRDHzf1LxsBgCJfNJP4,77264
+redisbench_admin/run_remote/standalone.py,sha256=dEidNJIprjRiFQqAAM-drYsks2ZZLjRKLs0Y4bfKe-w,33338
 redisbench_admin/run_remote/terraform.py,sha256=vV3eWXNwj7vsnFNqUgCir5ueZS4VYopEyzWiTtoSq0Q,4018
 redisbench_admin/utils/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/utils/benchmark_config.py,sha256=e1rvziZpI_8_vC4RKL5Rbwv1A4DKOXiv7xbFTrrAy88,23843
+redisbench_admin/utils/benchmark_config.py,sha256=71n2gm8ObeCBzNWQ0MLO7zRjIvmIzg7xuSE2-CZygcw,23869
 redisbench_admin/utils/local.py,sha256=zUvyVI9LZMT3qyxs1pO3mXL6Bt_1z9EZUGppaRcWNRA,3890
 redisbench_admin/utils/redisearch.py,sha256=lchUEzpt0zB1rHwlDlw9LLifAnxFWcLP-PePw7TjL-0,1602
 redisbench_admin/utils/redisgraph_benchmark_go.py,sha256=os7EJt6kBxsFJLKkSoANbjMT7-cEq4-Ns-49alk2Tf8,2048
-redisbench_admin/utils/remote.py,sha256=RAQ2VxfmlK7swN7ujCuwSI2soGSycjnxbQw_IrLxIFE,42205
+redisbench_admin/utils/remote.py,sha256=ewjSUX8xsQYolzVPXfaA7y1PWGWL7emwG4W9jspn14Y,43547
 redisbench_admin/utils/results.py,sha256=uKk3uNJ--bSXlUj_HGQ2OaV6MVqmXJVM8xTzFV6EOw4,3267
 redisbench_admin/utils/ssh.py,sha256=QW4AwlocMHJt05QMdN_4f8WeDmxiEwR80ny8VBThq6k,6533
 redisbench_admin/utils/utils.py,sha256=XVSvo1_DdcYwk2jOxL3VPVPbnDnhGYt8ieYfANo6rTo,15085
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=0wWYge3x_OMxWrzazNhJif2NK4tKsI963HVZqjczRag,6189
-redisbench_admin-0.11.47.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.11.47.dist-info/METADATA,sha256=HpQhYzoW41Ij4DjeA7TbpYKkCTyw9kFDYon9MSnhMkY,5596
-redisbench_admin-0.11.47.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redisbench_admin-0.11.47.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.11.47.dist-info/RECORD,,
+redisbench_admin-0.11.49.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.11.49.dist-info/METADATA,sha256=MvW4DsC1oIANjXhnvv5FF6O0HCL_POECirbx8tRDM14,5596
+redisbench_admin-0.11.49.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redisbench_admin-0.11.49.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.11.49.dist-info/RECORD,,