From 4c67f0391ba6001aea37642935466bbbb145da7a Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 10 Jan 2024 13:55:16 +0000 Subject: [PATCH] Split up deleting devices into batches (#16766) Otherwise for users with large numbers of devices this can cause a lot of woe. --- changelog.d/16766.misc | 1 + synapse/storage/databases/main/devices.py | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelog.d/16766.misc diff --git a/changelog.d/16766.misc b/changelog.d/16766.misc new file mode 100644 index 0000000000..ded77a11c4 --- /dev/null +++ b/changelog.d/16766.misc @@ -0,0 +1 @@ +Split up deleting devices into batches. diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py index 66fabf4f76..ae914298fb 100644 --- a/synapse/storage/databases/main/devices.py +++ b/synapse/storage/databases/main/devices.py @@ -1794,7 +1794,7 @@ async def delete_devices(self, user_id: str, device_ids: List[str]) -> None: device_ids: The IDs of the devices to delete """ - def _delete_devices_txn(txn: LoggingTransaction) -> None: + def _delete_devices_txn(txn: LoggingTransaction, device_ids: List[str]) -> None: self.db_pool.simple_delete_many_txn( txn, table="devices", @@ -1811,7 +1811,11 @@ def _delete_devices_txn(txn: LoggingTransaction) -> None: keyvalues={"user_id": user_id}, ) - await self.db_pool.runInteraction("delete_devices", _delete_devices_txn) + for batch in batch_iter(device_ids, 100): + await self.db_pool.runInteraction( + "delete_devices", _delete_devices_txn, batch + ) + for device_id in device_ids: self.device_id_exists_cache.invalidate((user_id, device_id))