OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow PUT/GET of aliases during faster join (#14292) 

without blocking on full state.
pull/14343/head
David Robertson 2022-11-01 15:02:39 +00:00 committed by GitHub
parent 2b56aaa0b8
commit 2bd7f3eeab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/14292.bugfix Normal file
View File

@ -0,0 +1 @@
Faster joins: do not block creation of or queries for room aliases during the resync.

4
synapse/handlers/directory.py
View File

@ -85,7 +85,7 @@ class DirectoryHandler:
# TODO(erikj): Add transactions. # TODO(erikj): Add transactions.
# TODO(erikj): Check if there is a current association. # TODO(erikj): Check if there is a current association.
if not servers: 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 room_id
) )
@ -290,7 +290,7 @@ class DirectoryHandler:
Codes.NOT_FOUND, 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 room_id
) )
servers_set = set(extra_servers) | set(servers) servers_set = set(extra_servers) | set(servers)