From c8309ea384cb01775cb51f8e49acdb3dfa6f33b5 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 14 Feb 2023 10:18:44 +0000 Subject: [PATCH 1/2] Fix clashing DB txn name --- synapse/storage/databases/main/end_to_end_keys.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/end_to_end_keys.py b/synapse/storage/databases/main/end_to_end_keys.py index c4ac6c33ba54..2523ec8fa7a5 100644 --- a/synapse/storage/databases/main/end_to_end_keys.py +++ b/synapse/storage/databases/main/end_to_end_keys.py @@ -260,7 +260,7 @@ async def get_e2e_device_keys_and_signatures( 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, ) From 8ba2c42d1a7da6fa613f2c648c6f5885c0d73ece Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 14 Feb 2023 10:19:19 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/15070.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15070.misc diff --git a/changelog.d/15070.misc b/changelog.d/15070.misc new file mode 100644 index 000000000000..0f3244de9fa3 --- /dev/null +++ b/changelog.d/15070.misc @@ -0,0 +1 @@ +Fix clashing database transaction name.