From 82fb1c683f70a03ad69c27455aa2e5405a18d2bf Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Sun, 3 May 2020 19:32:12 +0100 Subject: [PATCH 1/3] stop complaining about federation stream --- synapse/replication/tcp/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py index 2d1d119c7cc0..bf4f1a5949e2 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py @@ -262,7 +262,7 @@ async def on_RDATA(self, conn: AbstractConnection, cmd: RdataCommand): # `POSITION` command yet, and so we may have missed some rows. # Let's drop the row for now, on the assumption we'll receive a # `POSITION` soon and we'll catch up correctly then. - logger.warning( + logger.debug( "Discarding RDATA for unconnected stream %s -> %s", stream_name, cmd.token, From a517ba039d38abc86fd31b9aac1e2c192aac7f9b Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 5 May 2020 17:08:35 +0200 Subject: [PATCH 2/3] Changelog --- changelog.d/7421.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/7421.misc diff --git a/changelog.d/7421.misc b/changelog.d/7421.misc new file mode 100644 index 000000000000..314ab876547b --- /dev/null +++ b/changelog.d/7421.misc @@ -0,0 +1 @@ +Move logs about "Discarding RDATA for unconnected stream federation" to debug. From 9c8c3f5625264467a0761c934cdf287818c281c2 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Tue, 5 May 2020 18:39:01 +0200 Subject: [PATCH 3/3] Fix changelog --- changelog.d/7421.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/7421.misc b/changelog.d/7421.misc index 314ab876547b..676f285377f5 100644 --- a/changelog.d/7421.misc +++ b/changelog.d/7421.misc @@ -1 +1 @@ -Move logs about "Discarding RDATA for unconnected stream federation" to debug. +Move catchup of replication streams logic to worker.