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

Workaround for assertion errors from db_query_to_update_function (#7378) 

Hopefully this is no worse than what we have on master...
pull/7387/head
Richard van der Hoff 2020-05-01 09:25:16 +01:00 committed by GitHub
parent 627b0f5f27
commit b2dba06079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7378.misc Normal file
View File

@ -0,0 +1 @@
Move catchup of replication streams logic to worker.

3
synapse/replication/tcp/streams/_base.py
View File

@ -176,10 +176,9 @@ def db_query_to_update_function(
rows = await query_function(from_token, upto_token, limit) rows = await query_function(from_token, upto_token, limit)
updates = [(row[0], row[1:]) for row in rows] updates = [(row[0], row[1:]) for row in rows]
limited = False limited = False
if len(updates) == limit: if len(updates) >= limit:
upto_token = updates[-1][0] upto_token = updates[-1][0]
limited = True limited = True
assert len(updates) <= limit
return updates, upto_token, limited return updates, upto_token, limited