diff options
| author | Erik Johnston <erik@matrix.org> | 2023-02-14 12:20:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 11:20:25 +0000 |
| commit | cb262713b701d1abcbca03334d17e2d0f81eee4a (patch) | |
| tree | 29e40cab2ab26cb179b1c41d5fd4b5a2717fb2ae | |
| parent | Skip calculating unread push actions in `/sync` when `enable_push` is false. ... (diff) | |
| download | synapse-cb262713b701d1abcbca03334d17e2d0f81eee4a.tar.xz | |
Fix clashing DB txn name (#15070)
* Fix clashing DB txn name * Newsfile
| -rw-r--r-- | changelog.d/15070.misc | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/end_to_end_keys.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15070.misc b/changelog.d/15070.misc new file mode 100644 index 0000000000..0f3244de9f --- /dev/null +++ b/changelog.d/15070.misc @@ -0,0 +1 @@ +Fix clashing database transaction name. diff --git a/synapse/storage/databases/main/end_to_end_keys.py b/synapse/storage/databases/main/end_to_end_keys.py index 752dc16e17..2c2d145666 100644 --- a/synapse/storage/databases/main/end_to_end_keys.py +++ b/synapse/storage/databases/main/end_to_end_keys.py @@ -262,7 +262,7 @@ class EndToEndKeyWorkerStore(EndToEndKeyBackgroundStore, CacheInvalidationWorker for batch in batch_iter(signature_query, 50): cross_sigs_result = await self.db_pool.runInteraction( - "get_e2e_cross_signing_signatures", + "get_e2e_cross_signing_signatures_for_devices", self._get_e2e_cross_signing_signatures_for_devices_txn, batch, ) |