mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-29 07:28:55 +03:00
Allow PUT/GET of aliases during faster join (#14292)
without blocking on full state.
This commit is contained in:
parent
2b56aaa0b8
commit
2bd7f3eeab
2 changed files with 3 additions and 2 deletions
1
changelog.d/14292.bugfix
Normal file
1
changelog.d/14292.bugfix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Faster joins: do not block creation of or queries for room aliases during the resync.
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue