From 327da0d5766794649ccd7e6f181032d1f3eb55d1 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Thu, 9 Oct 2025 16:04:24 -0500
Subject: [PATCH 1/2] Move `start_doing_background_updates()` to
 `SynapseHomeServer.start_background_tasks()`

---
 synapse/app/homeserver.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 8d9b76e083c..b9ac86c2fc3 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -317,6 +317,11 @@ def start_listening(self) -> None:
                 # during parsing
                 logger.warning("Unrecognized listener type: %s", listener.type)
 
+    def start_background_tasks(self) -> None:
+        super().start_background_tasks()
+
+        self.get_datastores().main.db_pool.updates.start_doing_background_updates()
+
 
 def load_or_generate_config(argv_options: List[str]) -> HomeServerConfig:
     """
@@ -430,11 +435,6 @@ async def _start_when_reactor_running() -> None:
 
         await _base.start(hs, freeze)
 
-        # TODO: This should be moved to `SynapseHomeServer.start_background_tasks` (not
-        # `HomeServer.start_background_tasks`) (this way it matches the behavior of only
-        # running on `main`)
-        hs.get_datastores().main.db_pool.updates.start_doing_background_updates()
-
     # Register a callback to be invoked once the reactor is running
     register_start(hs, _start_when_reactor_running)
 

From a00eef7324ce3e286074edc9d827a1fbf5d6d016 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Thu, 9 Oct 2025 16:07:00 -0500
Subject: [PATCH 2/2] Add changelog

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

diff --git a/changelog.d/19036.misc b/changelog.d/19036.misc
new file mode 100644
index 00000000000..95b8daab9b0
--- /dev/null
+++ b/changelog.d/19036.misc
@@ -0,0 +1 @@
+Move `start_doing_background_updates()` to `SynapseHomeServer.start_background_tasks()`.