From 4cf90e13fa98171787372a47e06dcfdf9b953c26 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 13 Oct 2025 13:46:15 -0500 Subject: [PATCH] Move `start_doing_background_updates()` to `HomeServer.start_background_tasks()` --- synapse/app/homeserver.py | 5 ----- synapse/server.py | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b9ac86c2fc..23119c5cc5 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -317,11 +317,6 @@ class SynapseHomeServer(HomeServer): # 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: """ diff --git a/synapse/server.py b/synapse/server.py index b63a11273a..d3a0381434 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -640,12 +640,16 @@ class HomeServer(metaclass=abc.ABCMeta): Some handlers have side effects on instantiation (like registering background updates). This function causes them to be fetched, and therefore instantiated, to run those side effects. + + We assume these background tasks are only run on a single Synapse instance at a + time. """ for i in self.REQUIRED_ON_BACKGROUND_TASK_STARTUP: getattr(self, "get_" + i + "_handler")() self.get_task_scheduler() self.get_common_usage_metrics_manager().setup() start_phone_stats_home(self) + self.get_datastores().main.db_pool.updates.start_doing_background_updates() def get_reactor(self) -> ISynapseReactor: """