OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Mark a remote user's device list as stale if we failed to sync it

pull/7453/head
Brendan Abolivier 2020-05-07 16:38:20 +02:00
parent d9b8d27494
commit c06f4934ec
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/handlers/device.py
View File

@ -695,9 +695,10 @@ class DeviceListUpdater(object):
try: try:
result = yield self.federation.query_user_devices(origin, user_id) result = yield self.federation.query_user_devices(origin, user_id)
except (NotRetryingDestination, RequestSendFailed, HttpResponseException): except (NotRetryingDestination, RequestSendFailed, HttpResponseException):
# TODO: Remember that we are now out of sync and try again
# later
logger.warning("Failed to handle device list update for %s", user_id) logger.warning("Failed to handle device list update for %s", user_id)
# Mark the remote user's device list as stale so we know we need to retry it
# later.
yield self.store.mark_remote_user_device_cache_as_stale(user_id)
# We abort on exceptions rather than accepting the update # We abort on exceptions rather than accepting the update
# as otherwise synapse will 'forget' that its device list # as otherwise synapse will 'forget' that its device list
# is out of date. If we bail then we will retry the resync # is out of date. If we bail then we will retry the resync
@ -711,13 +712,14 @@ class DeviceListUpdater(object):
logger.info(e) logger.info(e)
return return
except Exception as e: except Exception as e:
# TODO: Remember that we are now out of sync and try again
# later
set_tag("error", True) set_tag("error", True)
log_kv( log_kv(
{"message": "Exception raised by federation request", "exception": e} {"message": "Exception raised by federation request", "exception": e}
) )
logger.exception("Failed to handle device list update for %s", user_id) logger.exception("Failed to handle device list update for %s", user_id)
# Mark the remote user's device list as stale so we know we need to retry it
# later.
yield self.store.mark_remote_user_device_cache_as_stale(user_id)
return return
log_kv({"result": result}) log_kv({"result": result})
stream_id = result["stream_id"] stream_id = result["stream_id"]