From 02aa7adf4c3f3bf71ddfcd4bd80d6adcf74a444c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 26 Nov 2024 07:45:18 +0000
Subject: [PATCH] Fix `delete_old_otks` job on worker deployments (#17960)

In a worker-mode deployment, the `E2eKeysHandler` is not necessarily
loaded, which means the handler for the `delete_old_otks` task will not
be registered. Make sure we load the handler.

Introduced in https://github.com/element-hq/synapse/pull/17934
---
 changelog.d/17960.bugfix | 1 +
 synapse/server.py        | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/17960.bugfix

diff --git a/changelog.d/17960.bugfix b/changelog.d/17960.bugfix
new file mode 100644
index 00000000000..767085320dc
--- /dev/null
+++ b/changelog.d/17960.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.120rc1 which would cause the newly-introduced `delete_old_otks` job to fail in worker-mode deployments.
diff --git a/synapse/server.py b/synapse/server.py
index c7b49188139..462e15cc2ff 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -254,6 +254,7 @@ class HomeServer(metaclass=abc.ABCMeta):
         "auth",
         "deactivate_account",
         "delayed_events",
+        "e2e_keys",  # for the `delete_old_otks` scheduled-task handler
         "message",
         "pagination",
         "profile",