diff options
| author | Erik Johnston <erik@matrix.org> | 2022-06-01 16:02:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-01 16:02:53 +0100 |
| commit | 888a29f4127723a8d048ce47cff37ee8a7a6f1b9 (patch) | |
| tree | 891ae4c95632801bb097aaed8aea5d8b541c5cf7 /synapse/handlers/sync.py | |
| parent | Fix complement tests using the wrong path (#12933) (diff) | |
| download | synapse-888a29f4127723a8d048ce47cff37ee8a7a6f1b9.tar.xz | |
Wait for lazy join to complete when getting current state (#12872)
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index a1d41358d9..b4ead79f97 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -506,8 +506,10 @@ class SyncHandler: # ensure that we always include current state in the timeline current_state_ids: FrozenSet[str] = frozenset() if any(e.is_state() for e in recents): - current_state_ids_map = await self.store.get_current_state_ids( - room_id + current_state_ids_map = ( + await self._state_storage_controller.get_current_state_ids( + room_id + ) ) current_state_ids = frozenset(current_state_ids_map.values()) @@ -574,8 +576,11 @@ class SyncHandler: # ensure that we always include current state in the timeline current_state_ids = frozenset() if any(e.is_state() for e in loaded_recents): - current_state_ids_map = await self.store.get_current_state_ids( - room_id + # FIXME(faster_joins): We use the partial state here as + # we don't want to block `/sync` on finishing a lazy join. + # Is this the correct way of doing it? + current_state_ids_map = ( + await self.store.get_partial_current_state_ids(room_id) ) current_state_ids = frozenset(current_state_ids_map.values()) |