mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-14 11:57:44 +00:00
Skip waiting for full state for incoming events (#13144)
When we receive an event over federation during a faster join, there is no need to wait for full state, since we have a whole reconciliation process designed to take the partial state into account.
This commit is contained in:
parent
c0efc689cb
commit
8c2825276f
3 changed files with 13 additions and 4 deletions
1
changelog.d/13144.misc
Normal file
1
changelog.d/13144.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Faster joins: skip waiting for full state when processing incoming events over federation.
|
|
@ -249,8 +249,12 @@ class StateHandler:
|
|||
partial_state = True
|
||||
|
||||
logger.debug("calling resolve_state_groups from compute_event_context")
|
||||
# we've already taken into account partial state, so no need to wait for
|
||||
# complete state here.
|
||||
entry = await self.resolve_state_groups_for_events(
|
||||
event.room_id, event.prev_event_ids()
|
||||
event.room_id,
|
||||
event.prev_event_ids(),
|
||||
await_full_state=False,
|
||||
)
|
||||
|
||||
state_ids_before_event = entry.state
|
||||
|
@ -335,7 +339,7 @@ class StateHandler:
|
|||
|
||||
@measure_func()
|
||||
async def resolve_state_groups_for_events(
|
||||
self, room_id: str, event_ids: Collection[str]
|
||||
self, room_id: str, event_ids: Collection[str], await_full_state: bool = True
|
||||
) -> _StateCacheEntry:
|
||||
"""Given a list of event_ids this method fetches the state at each
|
||||
event, resolves conflicts between them and returns them.
|
||||
|
@ -343,6 +347,8 @@ class StateHandler:
|
|||
Args:
|
||||
room_id
|
||||
event_ids
|
||||
await_full_state: if true, will block if we do not yet have complete
|
||||
state at these events.
|
||||
|
||||
Returns:
|
||||
The resolved state
|
||||
|
@ -350,7 +356,7 @@ class StateHandler:
|
|||
logger.debug("resolve_state_groups event_ids %s", event_ids)
|
||||
|
||||
state_groups = await self._state_storage_controller.get_state_group_for_events(
|
||||
event_ids
|
||||
event_ids, await_full_state=await_full_state
|
||||
)
|
||||
|
||||
state_group_ids = state_groups.values()
|
||||
|
|
|
@ -131,7 +131,9 @@ class _DummyStore:
|
|||
async def get_room_version_id(self, room_id):
|
||||
return RoomVersions.V1.identifier
|
||||
|
||||
async def get_state_group_for_events(self, event_ids):
|
||||
async def get_state_group_for_events(
|
||||
self, event_ids, await_full_state: bool = True
|
||||
):
|
||||
res = {}
|
||||
for event in event_ids:
|
||||
res[event] = self._event_to_state_group[event]
|
||||
|
|
Loading…
Reference in a new issue