redisbench-admin 0.10.22__py3-none-any.whl → 0.10.24__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

@@ -9,6 +9,7 @@ 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")))
+IGNORE_KEYSPACE_ERRORS = bool(int(os.getenv("IGNORE_KEYSPACE_ERRORS", "0")))
 
 
 def create_run_local_arguments(parser):
@@ -21,4 +22,10 @@ def create_run_local_arguments(parser):
         default=FLUSHALL_AT_START,
         help="At the start of every test send a FLUSHALL",
     )
+    parser.add_argument(
+        "--ignore_keyspace_errors",
+        type=bool,
+        default=IGNORE_KEYSPACE_ERRORS,
+        help="Ignore keyspace check errors. Will still log them as errors",
+    )
     return parser

redisbench_admin/run_local/local_db.py

@@ -47,6 +47,7 @@ def local_db_spin(
     setup_type,
     shard_count,
     flushall_on_every_test_start=False,
+    ignore_keyspace_errors=False,
 ):
     redis_conns = []
     artifact_version = "n/a"
@@ -204,10 +205,7 @@ def local_db_spin(
             )
         )
 
-    dbconfig_keyspacelen_check(
-        benchmark_config,
-        redis_conns,
-    )
+    dbconfig_keyspacelen_check(benchmark_config, redis_conns, ignore_keyspace_errors)
 
     artifact_version = run_redis_pre_steps(
         benchmark_config, redis_conns[0], required_modules

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,
@@ -94,6 +96,7 @@ def run_local_command_logic(args, project_name, project_version):
     profilers_enabled = args.enable_profilers
     s3_bucket_name = args.s3_bucket_name
     flushall_on_every_test_start = args.flushall_on_every_test_start
+    ignore_keyspace_errors = args.ignore_keyspace_errors
     profilers_list = []
     if profilers_enabled:
         profilers_list = args.profilers.split(",")
@@ -220,6 +223,7 @@ def run_local_command_logic(args, project_name, project_version):
                                         setup_type,
                                         shard_count,
                                         flushall_on_every_test_start,
+                                        ignore_keyspace_errors,
                                     )
                                     if result_db_spin is False:
                                         logging.warning(
@@ -374,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
@@ -411,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.22.dist-info → redisbench_admin-0.10.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redisbench-admin
-Version: 0.10.22
+Version: 0.10.24
 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.22.dist-info → redisbench_admin-0.10.24.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=WrJtKkQeaYkdDScgLPMXIOo6QdTAWh6ziXe-EVPpris,702
+redisbench_admin/run_local/args.py,sha256=rtIcyHiAisHgLAZ8Jv902B9fKNCMwGKfp0ea14nziCo,981
 redisbench_admin/run_local/local_client.py,sha256=gwawMDOBrf7m--uyxu8kMZC5LBiLjbUBSKvzVOdOAas,124
-redisbench_admin/run_local/local_db.py,sha256=l2qzR38TmV-tCQwpDJchjFcSAr7gnpW-kkbOi7HRg6Y,7001
+redisbench_admin/run_local/local_db.py,sha256=ZXKV6JDyEmBWrMa6nH_RZpyApTp9piNNIT0dQ-Fmiek,7036
 redisbench_admin/run_local/local_helpers.py,sha256=JyqLW2-Sbm35BXjxxfOB1yK7ADdLfcVrq08NLNdIwac,7026
-redisbench_admin/run_local/run_local.py,sha256=Kzq0WjH7OmxD6RQt7RDynDNdhJ2fAa8i_mCtny9cmMQ,23455
+redisbench_admin/run_local/run_local.py,sha256=dDgdFkISrZG-BUFQXwRtLp1qLX0p0Qcz3aW8fdrFLDE,24567
 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.22.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
-redisbench_admin-0.10.22.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
-redisbench_admin-0.10.22.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-redisbench_admin-0.10.22.dist-info/METADATA,sha256=lEpx709afWMCeTYmbiwjafpBsifuAqqL5eZXVjmq3wI,5336
-redisbench_admin-0.10.22.dist-info/RECORD,,
+redisbench_admin-0.10.24.dist-info/LICENSE,sha256=AAMtfs82zOOvmG68vILivm6lxi2rcOlGObmA8jzxQvw,10768
+redisbench_admin-0.10.24.dist-info/entry_points.txt,sha256=UUawXk_AS-PlieKJ1QxPQXGsRLb6OW_F0MtmA1W0KE8,113
+redisbench_admin-0.10.24.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+redisbench_admin-0.10.24.dist-info/METADATA,sha256=sY_ApRzy7mrxccwyIcRxbRIzzIAvmG2lXi0ZcDRzd-0,5336
+redisbench_admin-0.10.24.dist-info/RECORD,,