Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-08-07 14:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4829 from matrix-org/erikj/device_list_seen_updates

Browse Source 
When re-syncing device lists reset the state
This commit is contained in:
Erik Johnston 2019-03-08 09:54:54 +00:00 committed by GitHub
commit 469b66c102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix potential race in handling missing updates in device list updates.

10
synapse/handlers/device.py
View File

@ -597,6 +597,10 @@ class DeviceListEduUpdater(object):
) )
device_ids = [device["device_id"] for device in devices] device_ids = [device["device_id"] for device in devices]
yield self.device_handler.notify_device_update(user_id, device_ids) yield self.device_handler.notify_device_update(user_id, device_ids)
# We clobber the seen updates since we've re-synced from a given
# point.
self._seen_updates[user_id] = set([stream_id])
else: else:
# Simply update the single device, since we know that is the only # Simply update the single device, since we know that is the only
# change (because of the single prev_id matching the current cache) # change (because of the single prev_id matching the current cache)
@ -609,9 +613,9 @@ class DeviceListEduUpdater(object):
user_id, [device_id for device_id, _, _, _ in pending_updates] user_id, [device_id for device_id, _, _, _ in pending_updates]
) )
self._seen_updates.setdefault(user_id, set()).update( self._seen_updates.setdefault(user_id, set()).update(
stream_id for _, stream_id, _, _ in pending_updates stream_id for _, stream_id, _, _ in pending_updates
) )
@defer.inlineCallbacks @defer.inlineCallbacks
def _need_to_do_resync(self, user_id, updates): def _need_to_do_resync(self, user_id, updates):