From bfa93d1d3ba880244cbb8e8420832db1563bf6c3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 9 Feb 2024 10:51:11 +0000 Subject: [PATCH] Only do one concurrent fetch per server in keyring (#16894) Otherwise if we've stacked a bunch of requests for the keys of a server, we'll end up sending lots of concurrent requests for its keys, needlessly. --- changelog.d/16894.bugfix | 1 + synapse/crypto/keyring.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 changelog.d/16894.bugfix diff --git a/changelog.d/16894.bugfix b/changelog.d/16894.bugfix new file mode 100644 index 000000000..7e05370be --- /dev/null +++ b/changelog.d/16894.bugfix @@ -0,0 +1 @@ +Do not send multiple concurrent requests for keys for the same server. diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 1e7e5f70f..8c301e077 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -839,11 +839,12 @@ class ServerKeyFetcher(BaseV2KeyFetcher): Map from server_name -> key_id -> FetchKeyResult """ + # We only need to do one request per server. + servers_to_fetch = {k.server_name for k in keys_to_fetch} + results = {} - async def get_keys(key_to_fetch_item: _FetchKeyRequest) -> None: - server_name = key_to_fetch_item.server_name - + async def get_keys(server_name: str) -> None: try: keys = await self.get_server_verify_keys_v2_direct(server_name) results[server_name] = keys @@ -852,7 +853,7 @@ class ServerKeyFetcher(BaseV2KeyFetcher): except Exception: logger.exception("Error getting keys from %s", server_name) - await yieldable_gather_results(get_keys, keys_to_fetch) + await yieldable_gather_results(get_keys, servers_to_fetch) return results async def get_server_verify_keys_v2_direct(