From 3d4533b7330090f01b35446560f158107e39fd82 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 1 Sep 2023 13:11:52 +0100
Subject: [PATCH 1/2] Fix typo where we ended up with multiple
 `WorkerLocksHandler`

I don't think has caused any actual issues.

Introduced in #15891
---
 synapse/server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/synapse/server.py b/synapse/server.py
index fd16dacd0d05..71ead524d684 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -913,6 +913,7 @@ def get_common_usage_metrics_manager(self) -> CommonUsageMetricsManager:
         """Usage metrics shared between phone home stats and the prometheus exporter."""
         return CommonUsageMetricsManager(self)
 
+    @cache_in_self
     def get_worker_locks_handler(self) -> WorkerLocksHandler:
         return WorkerLocksHandler(self)
 

From ffa1edfb422095747f2dcd5deb53062d1ae37b74 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 1 Sep 2023 13:13:00 +0100
Subject: [PATCH 2/2] Newsfile

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

diff --git a/changelog.d/16220.misc b/changelog.d/16220.misc
new file mode 100644
index 000000000000..329e9f76f6fd
--- /dev/null
+++ b/changelog.d/16220.misc
@@ -0,0 +1 @@
+Fix typo where we ended up with multiple `WorkerLocksHandler`.