Workaround for assertion errors from db_query_to_update_function (#7378)

Hopefully this is no worse than what we have on master...
matrix-org · May 1, 2020 · b2dba06 · b2dba06
1 parent 627b0f5
commit b2dba06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/changelog.d/7378.misc b/changelog.d/7378.misc
@@ -0,0 +1 @@
+Move catchup of replication streams logic to worker.
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py
@@ -176,10 +176,9 @@ async def update_function(from_token, upto_token, limit):
         rows = await query_function(from_token, upto_token, limit)
         updates = [(row[0], row[1:]) for row in rows]
         limited = False
-        if len(updates) == limit:
+        if len(updates) >= limit:
             upto_token = updates[-1][0]
             limited = True
-        assert len(updates) <= limit
 
         return updates, upto_token, limited