Add cache to `get_server_keys_json_for_remote` #16123

erikjohnston · 2023-08-16T15:14:34Z

Plus a lot of refactoring.

Note that Synapse really only generates queries to this API for a single server name and a specific set of key IDs (rather than for multiple servers, or for all keys for a given server).

Reviewable commit-by-commit.

This isn't as inefficient as it sounds, as we only ever really get a single server in each request generally.

synapse/storage/keys.py

synapse/storage/databases/main/keys.py

tests/crypto/test_keyring.py

synapse/storage/databases/main/keys.py

synapse/rest/key/v2/remote_key_resource.py

synapse/storage/databases/main/keys.py

tests/crypto/test_keyring.py

DMRobertson

I think this looks sane but would appreciate working through my comments to check I understood.

DMRobertson · 2023-08-17T17:20:11Z

Reviewable commit-by-commit.

(thank you for this)

Co-authored-by: David Robertson <davidr@element.io>

erikjohnston added 3 commits August 16, 2023 15:13

Deduplicate query desc

88ba6f9

Remove unused param

a127d92

Refactor to return a proper type

cb1568b

erikjohnston force-pushed the erikj/cache_key_queries branch 2 times, most recently from f2e9354 to 3598dd1 Compare August 16, 2023 15:22

erikjohnston added 4 commits August 16, 2023 16:23

Return only the most recent key for each key ID

907c803

Split up the functions

b38d8d6

This isn't as inefficient as it sounds, as we only ever really get a single server in each request generally.

Add caching for fetching remote server keys

7d69047

Newsfile

ca6b0bb

erikjohnston force-pushed the erikj/cache_key_queries branch from 3598dd1 to ca6b0bb Compare August 16, 2023 15:25

erikjohnston marked this pull request as ready for review August 16, 2023 15:55

erikjohnston requested a review from a team as a code owner August 16, 2023 15:55