tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Only count non-cache state resolution

Browse source
This commit is contained in:
Erik Johnston 2019-06-18 13:01:52 +01:00
parent c9385dd238
commit 16a3124b76
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/state/__init__.py
View file

@ -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`.