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

Fix resync remote devices on receive PDU in worker mode. (#7815)

Browse Source 
The replication client requires that arguments are given as keyword
arguments, which was not done in this case. We also pull out the logic
so that we can catch and handle any exceptions raised, rather than
leaving them unhandled.
This commit is contained in:
Erik Johnston 2020-07-10 18:23:17 +01:00 committed by GitHub
parent e29c44340b
commit f1245dc3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7815.bugfix Normal file
View File

@ -0,0 +1 @@
Fix detection of out of sync remote device lists when receiving events from remote users.

27
synapse/handlers/federation.py
View File

@ -61,6 +61,7 @@ from synapse.logging.context import (
run_in_background, run_in_background,
) )
from synapse.logging.utils import log_function from synapse.logging.utils import log_function
from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.replication.http.devices import ReplicationUserDevicesResyncRestServlet from synapse.replication.http.devices import ReplicationUserDevicesResyncRestServlet
from synapse.replication.http.federation import ( from synapse.replication.http.federation import (
ReplicationCleanRoomRestServlet, ReplicationCleanRoomRestServlet,
@ -789,15 +790,25 @@ class FederationHandler(BaseHandler):
resync = True resync = True
if resync: if resync:
await self.store.mark_remote_user_device_cache_as_stale(event.sender) run_as_background_process(
"resync_device_due_to_pdu", self._resync_device, event.sender
)
# Immediately attempt a resync in the background async def _resync_device(self, sender: str) -> None:
if self.config.worker_app: """We have detected that the device list for the given user may be out
return run_in_background(self._user_device_resync, event.sender) of sync, so we try and resync them.
else: """
return run_in_background(
self._device_list_updater.user_device_resync, event.sender try:
) await self.store.mark_remote_user_device_cache_as_stale(sender)
# Immediately attempt a resync in the background
if self.config.worker_app:
await self._user_device_resync(user_id=sender)
else:
await self._device_list_updater.user_device_resync(sender)
except Exception:
logger.exception("Failed to resync device for %s", sender)
@log_function @log_function
async def backfill(self, dest, room_id, limit, extremities): async def backfill(self, dest, room_id, limit, extremities):