redisbench-admin 0.10.23__py3-none-any.whl → 0.10.25__py3-none-any.whl

redisbench_admin/run/common.py

@@ -699,6 +699,8 @@ def print_results_table_stdout(
     setup_name,
     test_name,
     cpu_usage=None,
+    kv_overall={},
+    metric_names=[],
 ):
     # check which metrics to extract
     (_, metrics,) = merge_default_and_config_metrics(
@@ -714,6 +716,11 @@ def print_results_table_stdout(
     results_matrix = extract_results_table(metrics, results_dict)
     if cpu_usage is not None:
         results_matrix.append(["Total shards CPU usage %", "", "", cpu_usage])
+    for metric_name in metric_names:
+        if metric_name in kv_overall:
+            metric_value = kv_overall[metric_name]
+            results_matrix.append([f"Total shards {metric_name}", "", "", metric_value])
+
     results_matrix = [[x[0], "{:.3f}".format(x[3])] for x in results_matrix]
     writer = MarkdownTableWriter(
         table_name=table_name,

redisbench_admin/run_local/args.py

@@ -8,13 +8,17 @@ import os
 from redisbench_admin.run.args import common_run_args
 from redisbench_admin.run.common import REDIS_BINARY
 
-FLUSHALL_AT_START = bool(int(os.getenv("FLUSHALL_AT_START", "0")))
+FLUSHALL_AT_START = bool(int(os.getenv("FLUSHALL_AT_START", "1")))
 IGNORE_KEYSPACE_ERRORS = bool(int(os.getenv("IGNORE_KEYSPACE_ERRORS", "0")))
+SKIP_REDIS_SPIN = bool(int(os.getenv("SKIP_REDIS_SPIN", "0")))
+REDIS_PORT = int(os.getenv("SKIP_REDIS_SPIN", "6379"))
+REDIS_HOST = os.getenv("REDIS_HOST", "127.0.0.1")
 
 
 def create_run_local_arguments(parser):
     parser = common_run_args(parser)
-    parser.add_argument("--port", type=int, default=6379)
+    parser.add_argument("--port", type=int, default=REDIS_PORT)
+    parser.add_argument("--host", type=str, default=REDIS_HOST)
     parser.add_argument("--redis-binary", type=str, default=REDIS_BINARY)
     parser.add_argument(
         "--flushall_on_every_test_start",
@@ -22,6 +26,12 @@ def create_run_local_arguments(parser):
         default=FLUSHALL_AT_START,
         help="At the start of every test send a FLUSHALL",
     )
+    parser.add_argument(
+        "--skip-redis-spin",
+        type=bool,
+        default=SKIP_REDIS_SPIN,
+        help="Skip redis spin. consider redis alive at host:port",
+    )
     parser.add_argument(
         "--ignore_keyspace_errors",
         type=bool,

redisbench_admin/run_local/local_db.py

@@ -79,84 +79,86 @@ def local_db_spin(
                 redis_processes,
             )
     else:
-        # setup Redis
-        # copy the rdb to DB machine
-        redis_7 = args.redis_7
-        logging.info(
-            "Using local temporary dir to spin up Redis Instance. Path: {}".format(
-                temporary_dir
-            )
-        )
-        if dbdir_folder is not None:
-            from distutils.dir_util import copy_tree
-
-            copy_tree(dbdir_folder, temporary_dir)
+        if args.skip_redis_spin is False:
+            # setup Redis
+            # copy the rdb to DB machine
+            redis_7 = args.redis_7
             logging.info(
-                "Copied entire content of {} into temporary path: {}".format(
-                    dbdir_folder, temporary_dir
+                "Using local temporary dir to spin up Redis Instance. Path: {}".format(
+                    temporary_dir
                 )
             )
-        (
-            _,
-            _,
-            redis_configuration_parameters,
-            dataset_load_timeout_secs,
-            modules_configuration_parameters_map,
-        ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
+            if dbdir_folder is not None:
+                from distutils.dir_util import copy_tree
 
-        logging.info(
-            "Using a dataset load timeout of {} seconds.".format(
-                dataset_load_timeout_secs
-            )
-        )
-
-        if setup_type == "oss-cluster":
-            cluster_api_enabled = True
-            shard_host = "127.0.0.1"
-            redis_processes, redis_conns = spin_up_local_redis_cluster(
-                binary,
-                temporary_dir,
-                shard_count,
-                shard_host,
-                args.port,
-                local_module_file,
+                copy_tree(dbdir_folder, temporary_dir)
+                logging.info(
+                    "Copied entire content of {} into temporary path: {}".format(
+                        dbdir_folder, temporary_dir
+                    )
+                )
+            (
+                _,
+                _,
                 redis_configuration_parameters,
                 dataset_load_timeout_secs,
                 modules_configuration_parameters_map,
-                redis_7,
-            )
+            ) = extract_redis_dbconfig_parameters(benchmark_config, "dbconfig")
 
-            status = setup_redis_cluster_from_conns(
-                redis_conns, shard_count, shard_host, args.port
-            )
-            if status is False:
-                raise Exception("Redis cluster setup failed. Failing test.")
-
-        if setup_type == "oss-standalone":
-            redis_processes = spin_up_local_redis(
-                binary,
-                args.port,
-                temporary_dir,
-                local_module_file,
-                redis_configuration_parameters,
-                dbdir_folder,
-                dataset_load_timeout_secs,
-                modules_configuration_parameters_map,
-                redis_7,
+            logging.info(
+                "Using a dataset load timeout of {} seconds.".format(
+                    dataset_load_timeout_secs
+                )
             )
-        if setup_type == "oss-cluster":
-            for shardn, redis_process in enumerate(redis_processes):
-                logging.info(
-                    "Checking if shard #{} process with pid={} is alive".format(
-                        shardn + 1, redis_process.pid
-                    )
+
+            if setup_type == "oss-cluster":
+                cluster_api_enabled = True
+                redis_processes, redis_conns = spin_up_local_redis_cluster(
+                    binary,
+                    temporary_dir,
+                    shard_count,
+                    args.host,
+                    args.port,
+                    local_module_file,
+                    redis_configuration_parameters,
+                    dataset_load_timeout_secs,
+                    modules_configuration_parameters_map,
+                    redis_7,
+                )
+
+                status = setup_redis_cluster_from_conns(
+                    redis_conns, shard_count, args.host, args.port
+                )
+                if status is False:
+                    raise Exception("Redis cluster setup failed. Failing test.")
+
+            if setup_type == "oss-standalone":
+                redis_processes = spin_up_local_redis(
+                    binary,
+                    args.port,
+                    temporary_dir,
+                    local_module_file,
+                    redis_configuration_parameters,
+                    dbdir_folder,
+                    dataset_load_timeout_secs,
+                    modules_configuration_parameters_map,
+                    redis_7,
                 )
-                if is_process_alive(redis_process) is False:
-                    raise Exception("Redis process is not alive. Failing test.")
-            cluster_init_steps(clusterconfig, redis_conns, local_module_file)
+            if setup_type == "oss-cluster":
+                for shardn, redis_process in enumerate(redis_processes):
+                    logging.info(
+                        "Checking if shard #{} process with pid={} is alive".format(
+                            shardn + 1, redis_process.pid
+                        )
+                    )
+                    if is_process_alive(redis_process) is False:
+                        raise Exception("Redis process is not alive. Failing test.")
+                cluster_init_steps(clusterconfig, redis_conns, local_module_file)
+        else:
+            logging.info("Skipping DB spin step...")
 
     if setup_type == "oss-standalone":
-        r = redis.Redis(port=args.port)
+        r = redis.Redis(port=args.port, host=args.host)
         r.ping()
         r.client_setname("redisbench-admin-standalone")
         redis_conns.append(r)
@@ -184,7 +186,7 @@ def local_db_spin(
             benchmark_config,
             full_benchmark_path,
             args.port,
-            "localhost",
+            args.host,
             local_benchmark_output_filename,
             False,
             benchmark_tool_workdir,

redisbench_admin/run_local/run_local.py

@@ -29,8 +29,10 @@ from redisbench_admin.run.common import (
 )
 from redisbench_admin.run.metrics import (
     from_info_to_overall_shard_cpu,
+    collect_redis_metrics,
     collect_cpu_data,
 )
+
 from redisbench_admin.run.redistimeseries import (
     datasink_profile_tabular_data,
     timeseries_test_sucess_flow,
@@ -288,7 +290,7 @@ def run_local_command_logic(args, project_name, project_version):
                                     benchmark_config,
                                     full_benchmark_path,
                                     args.port,
-                                    "127.0.0.1",
+                                    args.host,
                                     local_benchmark_output_filename,
                                     False,
                                     benchmark_tool_workdir,
@@ -376,6 +378,21 @@ def run_local_command_logic(args, project_name, project_version):
                                     test_name,
                                 )
 
+                                (
+                                    end_time_ms,
+                                    _,
+                                    overall_end_time_metrics,
+                                ) = collect_redis_metrics(
+                                    redis_conns,
+                                    ["memory"],
+                                    {
+                                        "memory": [
+                                            "used_memory",
+                                            "used_memory_dataset",
+                                        ]
+                                    },
+                                )
+
                                 if (
                                     profilers_enabled
                                     and args.push_results_redistimeseries
@@ -413,6 +430,11 @@ def run_local_command_logic(args, project_name, project_version):
                                         setup_name,
                                         test_name,
                                         total_shards_cpu_usage,
+                                        overall_end_time_metrics,
+                                        [
+                                            "memory_used_memory",
+                                            "memory_used_memory_dataset",
+                                        ],
                                     )
 
                                     # check KPIs

{redisbench_admin-0.10.23.dist-info → redisbench_admin-0.10.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.10.23
+Version: 0.10.25
 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.10.23.dist-info → redisbench_admin-0.10.25.dist-info}/RECORD

@@ -176,7 +176,7 @@ redisbench_admin/run/ann/pkg/test/test-jaccard.py,sha256=oIhaQCQKrQokwv3fvgLSwPl
 redisbench_admin/run/ann/pkg/test/test-metrics.py,sha256=vJdS8Kuk8bAnpB65Uqb-9rUUI35XrHwaO3cNwKX5gxc,3057
 redisbench_admin/run/args.py,sha256=Sspv4eusQs9HMVMIyv_hB9vQ3S_s0lHYGAL1gPb2WGM,7864
 redisbench_admin/run/cluster.py,sha256=QuptSW-IhdyFIoQ3hzY613jtQWxBrVIlgc8OarcEK20,6072
-redisbench_admin/run/common.py,sha256=-TU0ncwCV-RpU7xHiz1W0UJfvxVjm9EJqHUmX5qFAzo,25194
+redisbench_admin/run/common.py,sha256=nh21zFSO0uSbYn7whT929W3wcl9Zirx48XbZesOTjQU,25450
 redisbench_admin/run/ftsb/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run/ftsb/ftsb.py,sha256=plP-yxjMvvy-gITlXpuXJcyrPHfDoYYI8JRwTe5kK4M,2388
 redisbench_admin/run/git.py,sha256=6UYGcTN0MPzf4QDVoJnFkou0yZasLF6jLG7f0zoySq8,3064
@@ -205,11 +205,11 @@ redisbench_admin/run_async/log.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdU
 redisbench_admin/run_async/render_files.py,sha256=OMPy3-GnU14tQ4HNlF5utOnmzpRAXURwG_h8UDkTmYs,2674
 redisbench_admin/run_async/run_async.py,sha256=g2ZOQqj9vXZYaRyNpJZtgfYyY9tMuRmEv3Hh3qWOUs8,14525
 redisbench_admin/run_local/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
-redisbench_admin/run_local/args.py,sha256=rtIcyHiAisHgLAZ8Jv902B9fKNCMwGKfp0ea14nziCo,981
+redisbench_admin/run_local/args.py,sha256=wENpejSLBNApnBinJNS5sI0ZCCWVGMUHXLBQzS8NUSA,1398
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
-redisbench_admin/run_local/local_db.py,sha256=ZXKV6JDyEmBWrMa6nH_RZpyApTp9piNNIT0dQ-Fmiek,7036
+redisbench_admin/run_local/local_db.py,sha256=Xh7xyZaSyhmRXKyMsbKqO9aLUikf-EXGha3K1h9yL2M,7396
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=OL_Qla12vZmJ2SjwJMOX3GDeXekpls_ltmyxBeR1bnk,23576
+redisbench_admin/run_local/run_local.py,sha256=Kl0yF0VW68a_ydOapxPkSTHD2ET-88YeWsZvUihSH78,24565
 redisbench_admin/run_remote/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redisbench_admin/run_remote/args.py,sha256=vhV87avBwXL8c2QLqrAkIyWD53MYhN06F-3wRv3l5xE,3829
 redisbench_admin/run_remote/consts.py,sha256=bCMkwyeBD-EmOpoHKni7LjWy5WuaxGJhGhqpi4AL0RQ,386
@@ -235,8 +235,8 @@ redisbench_admin/utils/utils.py,sha256=FLDjhGkW0PWwcu_nlTnIW6aZtHzJGz4LIwvu1CpCa
 redisbench_admin/watchdog/__init__.py,sha256=cD7zfXt0VEmy0b7452HvcAxX_9kVj6Vm213yNdUHP20,95
 redisbench_admin/watchdog/args.py,sha256=nKsG1G6ATOZlAMHMtT9u3kXxduKCbejSZ5x8oB_ynZ8,1312
 redisbench_admin/watchdog/watchdog.py,sha256=jFGtm5ktjKuXKWvH7lnmf3pp-ch1WBJUOomXILJMDAg,6158
-redisbench_admin-0.10.23.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.10.23.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.10.23.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-redisbench_admin-0.10.23.dist-info/METADATA,sha256=uEBtr3c-EmfiSPpnI8RlZxI5tKjINeDtdlbG3BjdNJc,5336
-redisbench_admin-0.10.23.dist-info/RECORD,,
+redisbench_admin-0.10.25.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.10.25.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.10.25.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+redisbench_admin-0.10.25.dist-info/METADATA,sha256=FFWnpLj6Ei4eaFxj96622A2snvog6QlSn5IMGAaHhWE,5336
+redisbench_admin-0.10.25.dist-info/RECORD,,