From abc2a5f71ef57716e637322877031d482fee949a Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 13 Oct 2025 17:50:27 -0500 Subject: [PATCH 1/4] Revert "Move `start_doing_background_updates()` to `SynapseHomeServer.start_background_tasks()` (#19036)" This reverts commit d399d7649aedaeb3cd9edbc258917c407893c172. --- changelog.d/19036.misc | 1 - synapse/app/homeserver.py | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 changelog.d/19036.misc diff --git a/changelog.d/19036.misc b/changelog.d/19036.misc deleted file mode 100644 index 95b8daab9b0..00000000000 --- a/changelog.d/19036.misc +++ /dev/null @@ -1 +0,0 @@ -Move `start_doing_background_updates()` to `SynapseHomeServer.start_background_tasks()`. diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index b9ac86c2fc3..8d9b76e083c 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -317,11 +317,6 @@ 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: """ @@ -435,6 +430,11 @@ 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 91005630f9b86ac3676728a8f3887818d2c0e073 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 13 Oct 2025 17:56:10 -0500 Subject: [PATCH 2/4] Add temp changelog --- changelog.d/19059.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/19059.misc diff --git a/changelog.d/19059.misc b/changelog.d/19059.misc new file mode 100644 index 00000000000..d8f6c47cf8a --- /dev/null +++ b/changelog.d/19059.misc @@ -0,0 +1 @@ +TODO: Remove newsfile after we see CI passes. From 623a748abb7936c673d09810e83272223ecce5dd Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 17 Oct 2025 11:44:33 -0500 Subject: [PATCH 3/4] Update comment with actual learnings from #19057 --- synapse/app/homeserver.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 8d9b76e083c..e415d651bcf 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -430,9 +430,7 @@ 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`) + # TODO: Feels like this should be moved somewhere else. hs.get_datastores().main.db_pool.updates.start_doing_background_updates() # Register a callback to be invoked once the reactor is running From ade8806df7c2ce7e9c95586947caede9a345e85a Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 20 Oct 2025 10:55:02 -0500 Subject: [PATCH 4/4] Remove changelog before merge --- changelog.d/19059.misc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog.d/19059.misc diff --git a/changelog.d/19059.misc b/changelog.d/19059.misc deleted file mode 100644 index d8f6c47cf8a..00000000000 --- a/changelog.d/19059.misc +++ /dev/null @@ -1 +0,0 @@ -TODO: Remove newsfile after we see CI passes.