From 69cbb0f97ed9116d118de60a32925deae164bdfe Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 1 Apr 2020 10:12:47 +0100
Subject: [PATCH 1/2] Remove connections per replication stream metric.

This broke in a recent PR (#7024) and is no longer useful due to all
replication clients implicitly subscribing to all streams, so let's
just remove it.
---
 synapse/replication/tcp/resource.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/synapse/replication/tcp/resource.py b/synapse/replication/tcp/resource.py
index 8b6067e20df4..30021ee309df 100644
--- a/synapse/replication/tcp/resource.py
+++ b/synapse/replication/tcp/resource.py
@@ -99,22 +99,6 @@ def __init__(self, hs):
 
         self.streams_by_name = {stream.NAME: stream for stream in self.streams}
 
-        LaterGauge(
-            "synapse_replication_tcp_resource_connections_per_stream",
-            "",
-            ["stream_name"],
-            lambda: {
-                (stream_name,): len(
-                    [
-                        conn
-                        for conn in self.connections
-                        if stream_name in conn.replication_streams
-                    ]
-                )
-                for stream_name in self.streams_by_name
-            },
-        )
-
         self.federation_sender = None
         if not hs.config.send_federation:
             self.federation_sender = hs.get_federation_sender()

From 6d8fa532ce5845a13032129973b3c728e8fdb9ee Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 1 Apr 2020 10:15:21 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/7195.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7195.misc

diff --git a/changelog.d/7195.misc b/changelog.d/7195.misc
new file mode 100644
index 000000000000..676f285377f5
--- /dev/null
+++ b/changelog.d/7195.misc
@@ -0,0 +1 @@
+Move catchup of replication streams logic to worker.