mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 10:35:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add a delay to key lookup lock release to fix stack overflow

Browse source 
A tactical call_later here should fix #5723
This commit is contained in:
Richard van der Hoff 2019-07-19 17:57:00 +01:00
parent c7095be913
commit dcca56baba
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
synapse/crypto/keyring.py
View file

@ -259,6 +259,10 @@ class Keyring(object):
# When we've finished fetching all the keys for a given server_name,
# drop the lock by resolving the deferred in key_downloads.
def drop_server_lock(server_name):
d = self.key_downloads.pop(server_name)
d.callback(None)
def lookup_done(res, verify_request):
server_name = verify_request.server_name
server_requests = server_to_request_ids[server_name]
@ -269,8 +273,10 @@ class Keyring(object):
with PreserveLoggingContext(ctx):
logger.debug("Releasing key lookup lock on %s", server_name)
d = self.key_downloads.pop(server_name)
d.callback(None)
# ... but not immediately, as that can cause stack explosions if
# we get a long queue of lookups.
self.clock.call_later(0, drop_server_lock, server_name)
return res
for verify_request in verify_requests: