summary refs log tree commit diff
path: root/synapse/state
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2022-11-17 17:01:14 +0100
committerGitHub <noreply@github.com>2022-11-17 17:01:14 +0100
commit75888c2b1f5ec1c865c4690627bf101f7e0dffb9 (patch)
tree56aad979d178b5c6409ea4c6facf60aa24e76edc /synapse/state
parentReintroduce #14376, with bugfix for monoliths (#14468) (diff)
downloadsynapse-75888c2b1f5ec1c865c4690627bf101f7e0dffb9.tar.xz
Faster joins: do not wait for full state when creating events to send (#14403)
Signed-off-by: Mathieu Velten <mathieuv@matrix.org>
Diffstat (limited to 'synapse/state')
-rw-r--r--synapse/state/__init__.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/state/__init__.py b/synapse/state/__init__.py

index 6f3dd0463e..833ffec3de 100644 --- a/synapse/state/__init__.py +++ b/synapse/state/__init__.py
@@ -190,6 +190,7 @@ class StateHandler: room_id: str, event_ids: Collection[str], state_filter: Optional[StateFilter] = None, + await_full_state: bool = True, ) -> StateMap[str]: """Fetch the state after each of the given event IDs. Resolve them and return. @@ -200,13 +201,18 @@ class StateHandler: Args: room_id: the room_id containing the given events. event_ids: the events whose state should be fetched and resolved. + await_full_state: if `True`, will block if we do not yet have complete state + at the given `event_id`s, regardless of whether `state_filter` is + satisfied by partial state. Returns: the state dict (a mapping from (event_type, state_key) -> event_id) which holds the resolution of the states after the given event IDs. """ logger.debug("calling resolve_state_groups from compute_state_after_events") - ret = await self.resolve_state_groups_for_events(room_id, event_ids) + ret = await self.resolve_state_groups_for_events( + room_id, event_ids, await_full_state + ) return await ret.get_state(self._state_storage_controller, state_filter) async def get_current_user_ids_in_room(