summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-11-01 15:02:39 +0000
committerGitHub <noreply@github.com>2022-11-01 15:02:39 +0000
commit2bd7f3eeab1a4818359c9f585b660ff3f3d8bc6c (patch)
tree0bf20e807a4569ea29cf3f8feca4619caa28ad53 /synapse
parentMerge branch 'release-v1.71' into develop (diff)
downloadsynapse-2bd7f3eeab1a4818359c9f585b660ff3f3d8bc6c.tar.xz
Allow PUT/GET of aliases during faster join (#14292)
without blocking on full state.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/directory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py
index d52ebada6b..2ea52257cb 100644
--- a/synapse/handlers/directory.py
+++ b/synapse/handlers/directory.py
@@ -85,7 +85,7 @@ class DirectoryHandler:
         # 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
             )
 
@@ -290,7 +290,7 @@ class DirectoryHandler:
                 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)