From 16a3124b767a851e219777464a694b04dcc1aae7 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 18 Jun 2019 13:01:52 +0100 Subject: Only count non-cache state resolution --- synapse/state/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py index 8099297cfe..b914a5ba03 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) # Metrics for number of state groups involved in a resolution. state_groups_histogram = Histogram( "synapse_state_number_state_groups", "", - buckets=(0, 1, 2, 3, 5, 7, 10, 15, 20, 50, 100, 200, 500, "+Inf"), + buckets=(1, 2, 3, 5, 7, 10, 15, 20, 50, 100, 200, 500, "+Inf"), ) @@ -372,8 +372,6 @@ class StateHandler(object): room_id, event_ids ) - state_groups_histogram.observe(len(state_groups_ids)) - if len(state_groups_ids) == 0: defer.returnValue(_StateCacheEntry( state={}, @@ -498,6 +496,8 @@ class StateResolutionHandler(object): "Resolving state for %s with %d groups", room_id, len(state_groups_ids) ) + state_groups_histogram.observe(len(state_groups_ids)) + # start by assuming we won't have any conflicted state, and build up the new # state map by iterating through the state groups. If we discover a conflict, # we give up and instead use `resolve_events_with_store`. -- cgit 1.4.1