Skip to content

Bump batch size from 50 to 1000 for _get_e2e_cross_signing_signatures_for_devices query #18939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anoadragon453 merged 4 commits into from
Sep 23, 2025
Merged

Bump batch size from 50 to 1000 for _get_e2e_cross_signing_signatures_for_devices query #18939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
538389e
Bump batch size from 50 to 1000 for e2e signature query
anoadragon453 Sep 19, 2025
0908663
newsfile
anoadragon453 Sep 19, 2025
e2d9d34
add comment about batch size origin
anoadragon453 Sep 23, 2025
f96e65f
Update changelog
anoadragon453 Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/18939.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reduce overall number of calls to `_get_e2e_cross_signing_signatures_for_devices` by increasing the batch size of devices the query is called with, reducing DB load.
5 changes: 4 additions & 1 deletion synapse/storage/databases/main/end_to_end_keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,10 @@ async def get_e2e_device_keys_and_signatures(
if d is not None and d.keys is not None
)

for batch in batch_iter(signature_query, 50):
# 1000 is an arbitrary batch size. It helped performance on a very
# large-scale deployment (matrix.org), but has not been tested against
# any other setup.
for batch in batch_iter(signature_query, 1000):
Comment thread
anoadragon453 marked this conversation as resolved.
cross_sigs_result = (
await self._get_e2e_cross_signing_signatures_for_devices(batch)
)
Expand Down
Loading
⚡