diff options
| author | Erik Johnston <erik@matrix.org> | 2024-02-09 10:52:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2024-02-09 10:52:35 +0000 |
| commit | ea1b30940e6a3c24203e46000572a52dbc3009f2 (patch) | |
| tree | e77f47d1357e603c0acb35a82639d7eee0cf5bd4 | |
| parent | Only do one concurrent fetch per server in keyring (#16894) (diff) | |
| parent | Increase batching when fetching auth chains (#16893) (diff) | |
| download | synapse-ea1b30940e6a3c24203e46000572a52dbc3009f2.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.101' into develop
| -rw-r--r-- | changelog.d/16893.bugfix | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/event_federation.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/16893.bugfix b/changelog.d/16893.bugfix new file mode 100644 index 0000000000..7222cd765c --- /dev/null +++ b/changelog.d/16893.bugfix @@ -0,0 +1 @@ +Fix performance regression when fetching auth chains from the DB. Introduced in v1.100.0. diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py index 12e882062a..846c3f363a 100644 --- a/synapse/storage/databases/main/event_federation.py +++ b/synapse/storage/databases/main/event_federation.py @@ -310,7 +310,7 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas # Add all linked chains reachable from initial set of chains. chains_to_fetch = set(event_chains.keys()) while chains_to_fetch: - batch2 = tuple(itertools.islice(chains_to_fetch, 100)) + batch2 = tuple(itertools.islice(chains_to_fetch, 1000)) chains_to_fetch.difference_update(batch2) clause, args = make_in_list_sql_clause( txn.database_engine, "origin_chain_id", batch2 @@ -593,7 +593,7 @@ class EventFederationWorkerStore(SignatureWorkerStore, EventsWorkerStore, SQLBas # the loop) chains_to_fetch = set(seen_chains) while chains_to_fetch: - batch2 = tuple(itertools.islice(chains_to_fetch, 100)) + batch2 = tuple(itertools.islice(chains_to_fetch, 1000)) clause, args = make_in_list_sql_clause( txn.database_engine, "origin_chain_id", batch2 ) |