Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-20 00:34:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix check to ignore blank lines in incoming TCP replication (#14449)

Browse Source
This commit is contained in:
Andrew Morgan 2022-11-17 16:09:56 +00:00 committed by GitHub
parent 75888c2b1f
commit e7132c3f81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix type logic in TCP replication code that prevented correctly ignoring blank commands.

2
synapse/replication/tcp/protocol.py
View File

@ -245,7 +245,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
self._parse_and_dispatch_line(line) self._parse_and_dispatch_line(line)
def _parse_and_dispatch_line(self, line: bytes) -> None: def _parse_and_dispatch_line(self, line: bytes) -> None:
if line.strip() == "": if line.strip() == b"":
# Ignore blank lines # Ignore blank lines
return return

6
synapse/storage/database.py
View File

@ -569,15 +569,15 @@ class DatabasePool:
retcols=["update_name"], retcols=["update_name"],
desc="check_background_updates", desc="check_background_updates",
) )
updates = [x["update_name"] for x in updates] background_update_names = [x["update_name"] for x in updates]
for table, update_name in UNIQUE_INDEX_BACKGROUND_UPDATES.items(): for table, update_name in UNIQUE_INDEX_BACKGROUND_UPDATES.items():
if update_name not in updates: if update_name not in background_update_names:
logger.debug("Now safe to upsert in %s", table) logger.debug("Now safe to upsert in %s", table)
self._unsafe_to_upsert_tables.discard(table) self._unsafe_to_upsert_tables.discard(table)
# If there's any updates still running, reschedule to run. # If there's any updates still running, reschedule to run.
if updates: if background_update_names:
self._clock.call_later( self._clock.call_later(
15.0, 15.0,
run_as_background_process, run_as_background_process,