Skip to content
Snippets Groups Projects
Unverified Commit e7132c3f authored by Andrew Morgan's avatar Andrew Morgan Committed by GitHub
Browse files

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

parent 75888c2b
No related branches found
No related tags found
No related merge requests found
Fix type logic in TCP replication code that prevented correctly ignoring blank commands.
\ No newline at end of file
......@@ -245,7 +245,7 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
self._parse_and_dispatch_line(line)
def _parse_and_dispatch_line(self, line: bytes) -> None:
if line.strip() == "":
if line.strip() == b"":
# Ignore blank lines
return
......
......@@ -569,15 +569,15 @@ class DatabasePool:
retcols=["update_name"],
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():
if update_name not in updates:
if update_name not in background_update_names:
logger.debug("Now safe to upsert in %s", table)
self._unsafe_to_upsert_tables.discard(table)
# If there's any updates still running, reschedule to run.
if updates:
if background_update_names:
self._clock.call_later(
15.0,
run_as_background_process,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment