diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-05-01 09:25:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 09:25:16 +0100 |
| commit | b2dba0607944107990883618672d639f0614c492 (patch) | |
| tree | 45d9c0c15b1054ecafcfbcb9a2a0f153342b38d8 | |
| parent | Persist user interactive authentication sessions (#7302) (diff) | |
| download | synapse-b2dba0607944107990883618672d639f0614c492.tar.xz | |
Workaround for assertion errors from db_query_to_update_function (#7378)
Hopefully this is no worse than what we have on master...
| -rw-r--r-- | changelog.d/7378.misc | 1 | ||||
| -rw-r--r-- | synapse/replication/tcp/streams/_base.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changelog.d/7378.misc b/changelog.d/7378.misc new file mode 100644 index 0000000000..676f285377 --- /dev/null +++ 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 index 4ae3cffb1e..4af1afd119 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -176,10 +176,9 @@ def db_query_to_update_function( 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 |