redis-benchmarks-specification 0.1.334__py3-none-any.whl → 0.1.336__py3-none-any.whl

redis_benchmarks_specification/__common__/timeseries.py

@@ -1067,6 +1067,9 @@ def add_standardized_metric_bybranch(
         labels["deployment_name+branch"] = "{} {}".format(
             deployment_name, tf_github_branch
         )
+        labels["running_platform+branch"] = "{} {}".format(
+            running_platform, tf_github_branch
+        )
         labels["test_name"] = str(test_name)
         labels["metric"] = str(metric_name)
         logging.info(
@@ -1137,6 +1140,9 @@ def add_standardized_metric_byversion(
         labels["deployment_name+version"] = "{} {}".format(
             deployment_name, artifact_version
         )
+        labels["running_platform+version"] = "{} {}".format(
+            running_platform, artifact_version
+        )
         labels["test_name"] = str(test_name)
         labels["metric"] = str(metric_name)
         logging.info(

redis_benchmarks_specification/__runner__/runner.py

@@ -1476,14 +1476,15 @@ def process_self_contained_coordinator_stream(
     dry_run_include_preload = args.dry_run_include_preload
     defaults_filename = args.defaults_filename
     override_test_runs = args.override_test_runs
-    (
-        _,
-        _,
-        default_metrics,
-        _,
-        _,
-        _,
-    ) = get_defaults(defaults_filename)
+    get_defaults_result = get_defaults(defaults_filename)
+    # Handle variable number of return values from get_defaults
+    if len(get_defaults_result) >= 3:
+        default_metrics = get_defaults_result[2]
+    else:
+        default_metrics = []
+        logging.warning(
+            "get_defaults returned fewer values than expected, using empty default_metrics"
+        )
 
     # For memory comparison mode, analyze datasets before starting
     if memory_comparison_only:

redis_benchmarks_specification/__self_contained_coordinator__/args.py

@@ -201,4 +201,10 @@ def create_self_contained_coordinator_args(project_name):
         default=None,
         help="Password for HTTP endpoint authentication. HTTP server is disabled if not provided.",
     )
+    parser.add_argument(
+        "--skip-clear-pending-on-startup",
+        default=False,
+        action="store_true",
+        help="Skip automatically clearing pending messages for this consumer on startup. By default, pending messages are cleared to recover from crashes.",
+    )
     return parser

redis_benchmarks_specification/__self_contained_coordinator__/runners.py

@@ -99,6 +99,50 @@ def get_runners_consumer_group_name(running_platform):
     return consumer_group_name
 
 
+def clear_pending_messages_for_consumer(conn, running_platform, consumer_pos):
+    """Clear all pending messages for a specific consumer on startup"""
+    consumer_group_name = get_runners_consumer_group_name(running_platform)
+    consumer_name = "{}-self-contained-proc#{}".format(
+        consumer_group_name, consumer_pos
+    )
+
+    try:
+        # Get pending messages for this specific consumer
+        pending_info = conn.xpending_range(
+            STREAM_KEYNAME_NEW_BUILD_EVENTS,
+            consumer_group_name,
+            min="-",
+            max="+",
+            count=1000,  # Get up to 1000 pending messages
+            consumername=consumer_name,
+        )
+
+        if pending_info:
+            message_ids = [msg["message_id"] for msg in pending_info]
+            logging.info(
+                f"Found {len(message_ids)} pending messages for consumer {consumer_name}. Clearing them..."
+            )
+
+            # Acknowledge all pending messages to clear them
+            ack_count = conn.xack(
+                STREAM_KEYNAME_NEW_BUILD_EVENTS, consumer_group_name, *message_ids
+            )
+
+            logging.info(
+                f"Successfully cleared {ack_count} pending messages for consumer {consumer_name}"
+            )
+        else:
+            logging.info(f"No pending messages found for consumer {consumer_name}")
+
+    except redis.exceptions.ResponseError as e:
+        if "NOGROUP" in str(e):
+            logging.info(f"Consumer group {consumer_group_name} does not exist yet")
+        else:
+            logging.warning(f"Error clearing pending messages: {e}")
+    except Exception as e:
+        logging.error(f"Unexpected error clearing pending messages: {e}")
+
+
 def process_self_contained_coordinator_stream(
     conn,
     datasink_push_results_redistimeseries,

redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py

@@ -75,6 +75,7 @@ from redis_benchmarks_specification.__self_contained_coordinator__.args import (
 from redis_benchmarks_specification.__self_contained_coordinator__.runners import (
     build_runners_consumer_group_create,
     get_runners_consumer_group_name,
+    clear_pending_messages_for_consumer,
 )
 from redis_benchmarks_specification.__setups__.topologies import get_topologies
 
@@ -649,6 +650,17 @@ def main():
     logging.info("checking build spec requirements")
     running_platform = args.platform_name
     build_runners_consumer_group_create(gh_event_conn, running_platform)
+
+    # Clear pending messages by default (unless explicitly skipped)
+    if not args.skip_clear_pending_on_startup:
+        consumer_pos = args.consumer_pos
+        logging.info("Clearing pending messages on startup (default behavior)")
+        clear_pending_messages_for_consumer(
+            gh_event_conn, running_platform, consumer_pos
+        )
+    else:
+        logging.info("Skipping pending message cleanup as requested")
+
     stream_id = None
     docker_client = docker.from_env()
     home = str(Path.home())
@@ -674,14 +686,15 @@ def main():
     grafana_profile_dashboard = args.grafana_profile_dashboard
 
     defaults_filename = args.defaults_filename
-    (
-        _,
-        _,
-        default_metrics,
-        _,
-        _,
-        _,
-    ) = get_defaults(defaults_filename)
+    get_defaults_result = get_defaults(defaults_filename)
+    # Handle variable number of return values from get_defaults
+    if len(get_defaults_result) >= 3:
+        default_metrics = get_defaults_result[2]
+    else:
+        default_metrics = []
+        logging.warning(
+            "get_defaults returned fewer values than expected, using empty default_metrics"
+        )
 
     # Consumer id
     consumer_pos = args.consumer_pos

{redis_benchmarks_specification-0.1.334.dist-info → redis_benchmarks_specification-0.1.336.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: redis-benchmarks-specification
-Version: 0.1.334
+Version: 0.1.336
 Summary: The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute.
 Author: filipecosta90
 Author-email: filipecosta.90@gmail.com

{redis_benchmarks_specification-0.1.334.dist-info → redis_benchmarks_specification-0.1.336.dist-info}/RECORD

@@ -18,7 +18,7 @@ redis_benchmarks_specification/__common__/package.py,sha256=4uVt1BAZ999LV2rZkq--
 redis_benchmarks_specification/__common__/runner.py,sha256=TKMUFJ3nLSfmSU7P_ok9oM5-pI4L4tFxsWLUWaUHhbI,16733
 redis_benchmarks_specification/__common__/spec.py,sha256=D_SN48wg6NMthW_-OS1H5bydSDiuZpfd4WPPj7Vfwmc,5760
 redis_benchmarks_specification/__common__/suppress_warnings.py,sha256=xpOjJ_piGYWlGq9ITr-ZwSCl2GpreA9juZIBao4fDRs,691
-redis_benchmarks_specification/__common__/timeseries.py,sha256=P0tbmH7leEMQwvqlr4lYZgr_I6EY3chh1Kf7XWe5fDQ,54048
+redis_benchmarks_specification/__common__/timeseries.py,sha256=kHpkpNwZgWpjCh_Fg0wFcxNRMTb5SoSNwd_UHUCNVhc,54283
 redis_benchmarks_specification/__compare__/__init__.py,sha256=DtBXRp0Q01XgCFmY-1OIePMyyYihVNAjZ1Y8zwqSDN0,101
 redis_benchmarks_specification/__compare__/args.py,sha256=CNtA7pI9CJDTBJPGL2pNVfis7VDdxLautwRyka7oUCI,8911
 redis_benchmarks_specification/__compare__/compare.py,sha256=_AbuV3FZxtUZIdq4qq24LNzPNIdtQQaqrk8bUjn9blk,84327
@@ -26,9 +26,9 @@ redis_benchmarks_specification/__init__.py,sha256=YQIEx2sLPPA0JR9OuCuMNMNtm-f_gq
 redis_benchmarks_specification/__runner__/__init__.py,sha256=l-G1z-t6twUgi8QLueqoTQLvJmv3hJoEYskGm6H7L6M,83
 redis_benchmarks_specification/__runner__/args.py,sha256=K3VGmBC0-9lSv9H6VDp0N-6FGMWvc_4H0pG_TOXN5u8,11312
 redis_benchmarks_specification/__runner__/remote_profiling.py,sha256=R7obNQju8mmY9oKkcndjI4aAuxi84OCLhDSqqaYu1SU,18610
-redis_benchmarks_specification/__runner__/runner.py,sha256=V6PnV5Tt2qupLcfJg0yhj_AqI5pIzFj-0EXc_JtYo84,156096
+redis_benchmarks_specification/__runner__/runner.py,sha256=JW2fB0C6Ce4d6VVQK50qNqpSNGEjq6QVjowUMUA0gzs,156345
 redis_benchmarks_specification/__self_contained_coordinator__/__init__.py,sha256=l-G1z-t6twUgi8QLueqoTQLvJmv3hJoEYskGm6H7L6M,83
-redis_benchmarks_specification/__self_contained_coordinator__/args.py,sha256=1LePhRkDsoMPFclM_DoXBIoMBN8zcVoQMnm9wTK5Uqw,6961
+redis_benchmarks_specification/__self_contained_coordinator__/args.py,sha256=Rkajbvb-R4aEJd01gHNbAWrKuiqycHNfKVdO28nDEjI,7244
 redis_benchmarks_specification/__self_contained_coordinator__/artifacts.py,sha256=OVHqJzDgeSSRfUSiKp1ZTAVv14PvSbk-5yJsAAoUfpw,936
 redis_benchmarks_specification/__self_contained_coordinator__/build_info.py,sha256=vlg8H8Rxu2falW8xp1GvL1SV1fyBguSbz6Apxc7A2yM,2282
 redis_benchmarks_specification/__self_contained_coordinator__/clients.py,sha256=EL1V4-i-tTav1mcF_CUosqPF3Q1qi9BZL0zFajEk70c,1878
@@ -36,8 +36,8 @@ redis_benchmarks_specification/__self_contained_coordinator__/cpuset.py,sha256=s
 redis_benchmarks_specification/__self_contained_coordinator__/docker.py,sha256=09SyAfqlzs1KG9ZAajClNWtiNk4Jqzd--4-m3n1rLjU,3156
 redis_benchmarks_specification/__self_contained_coordinator__/post_processing.py,sha256=sVLKNnWdAqYY9DjVdqRC5tDaIrVSaI3Ca7w8-DQ-LRM,776
 redis_benchmarks_specification/__self_contained_coordinator__/prepopulation.py,sha256=1UeFr2T1ZQBcHCSd4W1ZtaWgXyFPfjLyDi_DgDc1eTA,2957
-redis_benchmarks_specification/__self_contained_coordinator__/runners.py,sha256=F11zO_ILnpmiVwTeCQnP5nDHQk3kNnajPftwKsbhlXE,30209
-redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py,sha256=2QdjjUyGB-GCyyJtSe984GY634i3qE019qWCnDBuI0U,111825
+redis_benchmarks_specification/__self_contained_coordinator__/runners.py,sha256=agom6H0iDUH_oQkObS8EtoAm0JUpTVeiBv-EMEnEMtY,31908
+redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py,sha256=e60Juo_zq-gSD4SPGwprFGamwYt5zLet47SkLl2TcWQ,112546
 redis_benchmarks_specification/__setups__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 redis_benchmarks_specification/__setups__/topologies.py,sha256=xQ1IJkcTji_ZjLiJd3vOxZpvbNtBLZw9cPkw5hGJKHU,481
 redis_benchmarks_specification/__spec__/__init__.py,sha256=l-G1z-t6twUgi8QLueqoTQLvJmv3hJoEYskGm6H7L6M,83
@@ -282,8 +282,8 @@ redis_benchmarks_specification/test-suites/memtier_benchmark-playbook-session-st
 redis_benchmarks_specification/test-suites/memtier_benchmark-playbook-session-storage-1k-sessions.yml,sha256=2egtIxPxCze2jlbAfgsk4v9JSQHNMoPLbDWFEW8olDg,7006
 redis_benchmarks_specification/test-suites/template.txt,sha256=ezqGiRPOvuSDO0iG7GEf-AGXNfHbgXI89_G0RUEzL88,481
 redis_benchmarks_specification/vector-search-test-suites/vector_db_benchmark_test.yml,sha256=PD7ow-k4Ll2BkhEC3aIqiaCZt8Hc4aJIp96Lw3J3mcI,791
-redis_benchmarks_specification-0.1.334.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-redis_benchmarks_specification-0.1.334.dist-info/METADATA,sha256=dE2ReU_PQYen1kcQ2YRh5AfPmkb1Hrx-j15Qj2vt508,22768
-redis_benchmarks_specification-0.1.334.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-redis_benchmarks_specification-0.1.334.dist-info/entry_points.txt,sha256=x5WBXCZsnDRTZxV7SBGmC65L2k-ygdDOxV8vuKN00Nk,715
-redis_benchmarks_specification-0.1.334.dist-info/RECORD,,
+redis_benchmarks_specification-0.1.336.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+redis_benchmarks_specification-0.1.336.dist-info/METADATA,sha256=hM1VX_8NMVcnRebZ26eX7WOZ2Zga0G06PYsV5FFJ114,22768
+redis_benchmarks_specification-0.1.336.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+redis_benchmarks_specification-0.1.336.dist-info/entry_points.txt,sha256=x5WBXCZsnDRTZxV7SBGmC65L2k-ygdDOxV8vuKN00Nk,715
+redis_benchmarks_specification-0.1.336.dist-info/RECORD,,