Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Speed up deleting to-device messages task (#16318)

Browse Source
This commit is contained in:
Erik Johnston 2023-09-14 14:56:07 +01:00 committed by GitHub
parent 39dc5de399
commit e9e2904eb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/16318.misc Normal file
View File

@ -0,0 +1 @@
Speed up task to delete to-device messages.

27
synapse/handlers/device.py
View File

@ -388,7 +388,8 @@ class DeviceWorkerHandler:
"Trying handling device list state for partial join: not supported on workers." "Trying handling device list state for partial join: not supported on workers."
) )
DEVICE_MSGS_DELETE_BATCH_LIMIT = 100 DEVICE_MSGS_DELETE_BATCH_LIMIT = 1000
DEVICE_MSGS_DELETE_SLEEP_MS = 1000
async def _delete_device_messages( async def _delete_device_messages(
self, self,
@ -400,19 +401,19 @@ class DeviceWorkerHandler:
device_id = task.params["device_id"] device_id = task.params["device_id"]
up_to_stream_id = task.params["up_to_stream_id"] up_to_stream_id = task.params["up_to_stream_id"]
res = await self.store.delete_messages_for_device( # Delete the messages in batches to avoid too much DB load.
user_id=user_id, while True:
device_id=device_id, res = await self.store.delete_messages_for_device(
up_to_stream_id=up_to_stream_id, user_id=user_id,
limit=DeviceHandler.DEVICE_MSGS_DELETE_BATCH_LIMIT, device_id=device_id,
) up_to_stream_id=up_to_stream_id,
limit=DeviceHandler.DEVICE_MSGS_DELETE_BATCH_LIMIT,
)
if res < DeviceHandler.DEVICE_MSGS_DELETE_BATCH_LIMIT: if res < DeviceHandler.DEVICE_MSGS_DELETE_BATCH_LIMIT:
return TaskStatus.COMPLETE, None, None return TaskStatus.COMPLETE, None, None
else:
# There is probably still device messages to be deleted, let's keep the task active and it will be run await self.clock.sleep(DeviceHandler.DEVICE_MSGS_DELETE_SLEEP_MS / 1000.0)
# again in a subsequent scheduler loop run (probably the next one, if not too many tasks are running).
return TaskStatus.ACTIVE, None, None
class DeviceHandler(DeviceWorkerHandler): class DeviceHandler(DeviceWorkerHandler):