From 85363fdb46166e7cc98c7606d6f4c45e45ef188a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 27 May 2020 10:37:59 +0100
Subject: [PATCH 1/2] Ensure ReplicationStreamer is always started when
 replication enabled.

Fixes #7566.
---
 synapse/replication/tcp/handler.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py
index 03300e533608..cbcf46f3ae6c 100644
--- a/synapse/replication/tcp/handler.py
+++ b/synapse/replication/tcp/handler.py
@@ -159,6 +159,9 @@ def start_replication(self, hs):
                 hs.config.redis_port,
             )
 
+            # First let's ensure that we have a ReplicationStreamer started.
+            hs.get_replication_streamer()
+
             # We need two connections to redis, one for the subscription stream and
             # one to send commands to (as you can't send further redis commands to a
             # connection after SUBSCRIBE is called).

From 365f2e2c3cc21c55fb2fc0b2996c60f02a0c6acf Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 27 May 2020 10:39:48 +0100
Subject: [PATCH 2/2] Newsfile

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

diff --git a/changelog.d/7579.bugfix b/changelog.d/7579.bugfix
new file mode 100644
index 000000000000..54542b60262c
--- /dev/null
+++ b/changelog.d/7579.bugfix
@@ -0,0 +1 @@
+Fix bug where `ReplicationStreamer` was not always started when replication was enabled. Bug introduced in v1.14.0rc1.