summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-05-05 23:01:12 +0100
committerRichard van der Hoff <richard@matrix.org>2020-05-05 23:01:12 +0100
commita8c17da245c4265db3e70589496f4f3b607fcb8f (patch)
tree2715dd3d43bb138d26620870f6dff4553ed656bc
parentMerge branch 'release-v1.13.0' into rav/fix_dropped_messages (diff)
parentMove logs about discarded RDATA to debug (#7421) (diff)
downloadsynapse-a8c17da245c4265db3e70589496f4f3b607fcb8f.tar.xz
Merge branch 'release-v1.13.0' into rav/fix_dropped_messages
-rw-r--r--changelog.d/7421.misc1
-rw-r--r--synapse/replication/tcp/handler.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/7421.misc b/changelog.d/7421.misc
new file mode 100644
index 0000000000..676f285377
--- /dev/null
+++ b/changelog.d/7421.misc
@@ -0,0 +1 @@
+Move catchup of replication streams logic to worker.
diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py
index 467e8695e0..b14a3d9fca 100644
--- a/synapse/replication/tcp/handler.py
+++ b/synapse/replication/tcp/handler.py
@@ -265,7 +265,7 @@ class ReplicationCommandHandler:
             if not sbc or stream_name not in sbc:
                 # Let's drop the row for now, on the assumption we'll receive a
                 # `POSITION` soon and we'll catch up correctly then.
-                logger.info(
+                logger.debug(
                     "Discarding RDATA for unconnected stream %s -> %s",
                     stream_name,
                     cmd.token,