diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-04-22 16:53:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-22 16:53:24 +0100 |
commit | 69018acbd2d1f331d6a52335b4938c3753b16de6 (patch) | |
tree | 00d9527b8a0bd4451acd41b6d59f07fb563082bb /synapse/storage/databases | |
parent | Remove `synapse.types.Collection` (#9856) (diff) | |
download | synapse-69018acbd2d1f331d6a52335b4938c3753b16de6.tar.xz |
Clear the resync bit after resyncing device lists (#9867)
Fixes #9866.
Diffstat (limited to 'synapse/storage/databases')
-rw-r--r-- | synapse/storage/databases/main/devices.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/synapse/storage/databases/main/devices.py b/synapse/storage/databases/main/devices.py index 9be713399f..c9346de316 100644 --- a/synapse/storage/databases/main/devices.py +++ b/synapse/storage/databases/main/devices.py @@ -717,7 +717,15 @@ class DeviceWorkerStore(SQLBaseStore): keyvalues={"user_id": user_id}, values={}, insertion_values={"added_ts": self._clock.time_msec()}, - desc="make_remote_user_device_cache_as_stale", + desc="mark_remote_user_device_cache_as_stale", + ) + + async def mark_remote_user_device_cache_as_valid(self, user_id: str) -> None: + # Remove the database entry that says we need to resync devices, after a resync + await self.db_pool.simple_delete( + table="device_lists_remote_resync", + keyvalues={"user_id": user_id}, + desc="mark_remote_user_device_cache_as_valid", ) async def mark_remote_user_device_list_as_unsubscribed(self, user_id: str) -> None: @@ -1289,15 +1297,6 @@ class DeviceStore(DeviceWorkerStore, DeviceBackgroundUpdateStore): lock=False, ) - # If we're replacing the remote user's device list cache presumably - # we've done a full resync, so we remove the entry that says we need - # to resync - self.db_pool.simple_delete_txn( - txn, - table="device_lists_remote_resync", - keyvalues={"user_id": user_id}, - ) - async def add_device_change_to_streams( self, user_id: str, device_ids: Collection[str], hosts: List[str] ): |