Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Allow PUT/GET of aliases during faster join #14292

Merged
merged 4 commits into from
Nov 1, 2022
Merged

Allow PUT/GET of aliases during faster join #14292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d151cf
Allow PUT/GET of aliases during faster join
Oct 25, 2022
e4f8582
Changelog
Oct 25, 2022
419e6c5
Use existing similar helper function instead
Nov 1, 2022
11dc46f
Fixup import list
Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14292.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster joins: do not block creation of or queries for room aliases during the resync.
4 changes: 2 additions & 2 deletions synapse/handlers/directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ async def _create_association(
# TODO(erikj): Add transactions.
# TODO(erikj): Check if there is a current association.
if not servers:
servers = await self._storage_controllers.state.get_current_hosts_in_room(
servers = await self._storage_controllers.state.get_current_hosts_in_room_or_partial_state_approximation(
room_id
)

Expand Down Expand Up @@ -290,7 +290,7 @@ async def get_association(self, room_alias: RoomAlias) -> JsonDict:
Codes.NOT_FOUND,
)

extra_servers = await self._storage_controllers.state.get_current_hosts_in_room(
extra_servers = await self._storage_controllers.state.get_current_hosts_in_room_or_partial_state_approximation(
room_id
)
servers_set = set(extra_servers) | set(servers)
Expand Down