From 12623cf38c48bf14a24610467b15924141ce9966 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 20 Jul 2021 12:31:51 +0100
Subject:  1.39.0rc1

---
 changelog.d/10250.bugfix  | 1 -
 changelog.d/10276.bugfix  | 1 -
 changelog.d/10289.misc    | 1 -
 changelog.d/10298.feature | 1 -
 changelog.d/10305.feature | 1 -
 changelog.d/10313.doc     | 1 -
 changelog.d/10315.misc    | 1 -
 changelog.d/10316.misc    | 1 -
 changelog.d/10317.bugfix  | 1 -
 changelog.d/10322.doc     | 1 -
 changelog.d/10324.misc    | 1 -
 changelog.d/10332.feature | 1 -
 changelog.d/10337.doc     | 1 -
 changelog.d/10343.bugfix  | 1 -
 changelog.d/10344.bugfix  | 1 -
 changelog.d/10345.misc    | 1 -
 changelog.d/10347.misc    | 1 -
 changelog.d/10348.misc    | 1 -
 changelog.d/10349.misc    | 1 -
 changelog.d/10350.misc    | 1 -
 changelog.d/10353.doc     | 1 -
 changelog.d/10355.bugfix  | 1 -
 changelog.d/10357.misc    | 1 -
 changelog.d/10359.bugfix  | 1 -
 changelog.d/10360.feature | 1 -
 changelog.d/10367.bugfix  | 1 -
 changelog.d/10368.doc     | 1 -
 changelog.d/10370.doc     | 1 -
 changelog.d/10380.misc    | 1 -
 changelog.d/10381.misc    | 1 -
 changelog.d/10382.misc    | 1 -
 changelog.d/10383.misc    | 1 -
 changelog.d/10385.misc    | 1 -
 changelog.d/10386.removal | 1 -
 changelog.d/10391.misc    | 1 -
 changelog.d/10393.misc    | 1 -
 changelog.d/10395.doc     | 1 -
 changelog.d/10396.doc     | 1 -
 changelog.d/10398.misc    | 1 -
 changelog.d/10399.doc     | 1 -
 changelog.d/10400.bugfix  | 1 -
 changelog.d/10404.bugfix  | 1 -
 changelog.d/10414.bugfix  | 1 -
 changelog.d/10418.misc    | 1 -
 changelog.d/10421.misc    | 1 -
 changelog.d/10427.feature | 1 -
 changelog.d/10430.misc    | 1 -
 changelog.d/9721.removal  | 1 -
 changelog.d/9884.feature  | 1 -
 changelog.d/9971.doc      | 1 -
 50 files changed, 50 deletions(-)
 delete mode 100644 changelog.d/10250.bugfix
 delete mode 100644 changelog.d/10276.bugfix
 delete mode 100644 changelog.d/10289.misc
 delete mode 100644 changelog.d/10298.feature
 delete mode 100644 changelog.d/10305.feature
 delete mode 100644 changelog.d/10313.doc
 delete mode 100644 changelog.d/10315.misc
 delete mode 100644 changelog.d/10316.misc
 delete mode 100644 changelog.d/10317.bugfix
 delete mode 100644 changelog.d/10322.doc
 delete mode 100644 changelog.d/10324.misc
 delete mode 100644 changelog.d/10332.feature
 delete mode 100644 changelog.d/10337.doc
 delete mode 100644 changelog.d/10343.bugfix
 delete mode 100644 changelog.d/10344.bugfix
 delete mode 100644 changelog.d/10345.misc
 delete mode 100644 changelog.d/10347.misc
 delete mode 100644 changelog.d/10348.misc
 delete mode 100644 changelog.d/10349.misc
 delete mode 100644 changelog.d/10350.misc
 delete mode 100644 changelog.d/10353.doc
 delete mode 100644 changelog.d/10355.bugfix
 delete mode 100644 changelog.d/10357.misc
 delete mode 100644 changelog.d/10359.bugfix
 delete mode 100644 changelog.d/10360.feature
 delete mode 100644 changelog.d/10367.bugfix
 delete mode 100644 changelog.d/10368.doc
 delete mode 100644 changelog.d/10370.doc
 delete mode 100644 changelog.d/10380.misc
 delete mode 100644 changelog.d/10381.misc
 delete mode 100644 changelog.d/10382.misc
 delete mode 100644 changelog.d/10383.misc
 delete mode 100644 changelog.d/10385.misc
 delete mode 100644 changelog.d/10386.removal
 delete mode 100644 changelog.d/10391.misc
 delete mode 100644 changelog.d/10393.misc
 delete mode 100644 changelog.d/10395.doc
 delete mode 100644 changelog.d/10396.doc
 delete mode 100644 changelog.d/10398.misc
 delete mode 100644 changelog.d/10399.doc
 delete mode 100644 changelog.d/10400.bugfix
 delete mode 100644 changelog.d/10404.bugfix
 delete mode 100644 changelog.d/10414.bugfix
 delete mode 100644 changelog.d/10418.misc
 delete mode 100644 changelog.d/10421.misc
 delete mode 100644 changelog.d/10427.feature
 delete mode 100644 changelog.d/10430.misc
 delete mode 100644 changelog.d/9721.removal
 delete mode 100644 changelog.d/9884.feature
 delete mode 100644 changelog.d/9971.doc

(limited to 'changelog.d')

diff --git a/changelog.d/10250.bugfix b/changelog.d/10250.bugfix
deleted file mode 100644
index a8107dafb2..0000000000
--- a/changelog.d/10250.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add base starting insertion event when no chunk ID is specified in the historical batch send API.
diff --git a/changelog.d/10276.bugfix b/changelog.d/10276.bugfix
deleted file mode 100644
index 42adc57ad1..0000000000
--- a/changelog.d/10276.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix historical batch send endpoint (MSC2716) rejecting batches with messages from multiple senders.
diff --git a/changelog.d/10289.misc b/changelog.d/10289.misc
deleted file mode 100644
index 2df30e7a7a..0000000000
--- a/changelog.d/10289.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert `room_depth.min_depth` column to a `BIGINT`.
diff --git a/changelog.d/10298.feature b/changelog.d/10298.feature
deleted file mode 100644
index 7059db5075..0000000000
--- a/changelog.d/10298.feature
+++ /dev/null
@@ -1 +0,0 @@
-The spaces summary API now returns any joinable rooms, not only rooms which are world-readable.
diff --git a/changelog.d/10305.feature b/changelog.d/10305.feature
deleted file mode 100644
index 7059db5075..0000000000
--- a/changelog.d/10305.feature
+++ /dev/null
@@ -1 +0,0 @@
-The spaces summary API now returns any joinable rooms, not only rooms which are world-readable.
diff --git a/changelog.d/10313.doc b/changelog.d/10313.doc
deleted file mode 100644
index 44086e3d9d..0000000000
--- a/changelog.d/10313.doc
+++ /dev/null
@@ -1 +0,0 @@
-Simplify structure of room admin API.
\ No newline at end of file
diff --git a/changelog.d/10315.misc b/changelog.d/10315.misc
deleted file mode 100644
index 2c78644e20..0000000000
--- a/changelog.d/10315.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add tests to characterise the current behaviour of R30 phone-home metrics.
diff --git a/changelog.d/10316.misc b/changelog.d/10316.misc
deleted file mode 100644
index 1fd0810fde..0000000000
--- a/changelog.d/10316.misc
+++ /dev/null
@@ -1 +0,0 @@
-Rebuild event context and auth when processing specific results from `ThirdPartyEventRules` modules.
diff --git a/changelog.d/10317.bugfix b/changelog.d/10317.bugfix
deleted file mode 100644
index 826c269eff..0000000000
--- a/changelog.d/10317.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix purging rooms that other homeservers are still sending events for. Contributed by @ilmari.
diff --git a/changelog.d/10322.doc b/changelog.d/10322.doc
deleted file mode 100644
index db604cf2aa..0000000000
--- a/changelog.d/10322.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a broken link in the admin api docs.
diff --git a/changelog.d/10324.misc b/changelog.d/10324.misc
deleted file mode 100644
index 3c3ee6d6fc..0000000000
--- a/changelog.d/10324.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor change to the code that populates `user_daily_visits`.
diff --git a/changelog.d/10332.feature b/changelog.d/10332.feature
deleted file mode 100644
index 091947ff22..0000000000
--- a/changelog.d/10332.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a new version of the R30 phone-home metric, which removes a false impression of retention given by the old R30 metric.
diff --git a/changelog.d/10337.doc b/changelog.d/10337.doc
deleted file mode 100644
index f305bdb3ba..0000000000
--- a/changelog.d/10337.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix formatting in the logcontext documentation.
diff --git a/changelog.d/10343.bugfix b/changelog.d/10343.bugfix
deleted file mode 100644
index 53ccf79a81..0000000000
--- a/changelog.d/10343.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix errors during backfill caused by previously purged redaction events. Contributed by Andreas Rammhold (@andir).
diff --git a/changelog.d/10344.bugfix b/changelog.d/10344.bugfix
deleted file mode 100644
index ab6eb4999f..0000000000
--- a/changelog.d/10344.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the user directory becoming broken (and noisy errors being logged) when knocking and room statistics are in use.
diff --git a/changelog.d/10345.misc b/changelog.d/10345.misc
deleted file mode 100644
index 7424486e87..0000000000
--- a/changelog.d/10345.misc
+++ /dev/null
@@ -1 +0,0 @@
-Re-enable Sytests that were disabled for the 1.37.1 release.
diff --git a/changelog.d/10347.misc b/changelog.d/10347.misc
deleted file mode 100644
index b2275a1350..0000000000
--- a/changelog.d/10347.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run `pyupgrade` on the codebase.
\ No newline at end of file
diff --git a/changelog.d/10348.misc b/changelog.d/10348.misc
deleted file mode 100644
index b2275a1350..0000000000
--- a/changelog.d/10348.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run `pyupgrade` on the codebase.
\ No newline at end of file
diff --git a/changelog.d/10349.misc b/changelog.d/10349.misc
deleted file mode 100644
index 5b014e7416..0000000000
--- a/changelog.d/10349.misc
+++ /dev/null
@@ -1 +0,0 @@
-Switch `application_services_txns.txn_id` database column to `BIGINT`.
diff --git a/changelog.d/10350.misc b/changelog.d/10350.misc
deleted file mode 100644
index eed2d8552a..0000000000
--- a/changelog.d/10350.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert internal type variable syntax to reflect wider ecosystem use.
\ No newline at end of file
diff --git a/changelog.d/10353.doc b/changelog.d/10353.doc
deleted file mode 100644
index 274ac83549..0000000000
--- a/changelog.d/10353.doc
+++ /dev/null
@@ -1 +0,0 @@
-Refresh the logcontext dev documentation.
diff --git a/changelog.d/10355.bugfix b/changelog.d/10355.bugfix
deleted file mode 100644
index 92df612011..0000000000
--- a/changelog.d/10355.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix newly added `synapse_federation_server_oldest_inbound_pdu_in_staging` prometheus metric to measure age rather than timestamp.
diff --git a/changelog.d/10357.misc b/changelog.d/10357.misc
deleted file mode 100644
index 7424486e87..0000000000
--- a/changelog.d/10357.misc
+++ /dev/null
@@ -1 +0,0 @@
-Re-enable Sytests that were disabled for the 1.37.1 release.
diff --git a/changelog.d/10359.bugfix b/changelog.d/10359.bugfix
deleted file mode 100644
index d318f8fa08..0000000000
--- a/changelog.d/10359.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix PostgreSQL sometimes using table scans for queries against `state_groups_state` table, taking a long time and a large amount of IO.
diff --git a/changelog.d/10360.feature b/changelog.d/10360.feature
deleted file mode 100644
index 904221cb6d..0000000000
--- a/changelog.d/10360.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow providing credentials to `http_proxy`.
\ No newline at end of file
diff --git a/changelog.d/10367.bugfix b/changelog.d/10367.bugfix
deleted file mode 100644
index b445556084..0000000000
--- a/changelog.d/10367.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Bugfix `make_room_admin` fails for users that have left a private room.
\ No newline at end of file
diff --git a/changelog.d/10368.doc b/changelog.d/10368.doc
deleted file mode 100644
index 10297aa424..0000000000
--- a/changelog.d/10368.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add delegation example for caddy in the reverse proxy documentation. Contributed by @moritzdietz.
diff --git a/changelog.d/10370.doc b/changelog.d/10370.doc
deleted file mode 100644
index 8c59d98ee8..0000000000
--- a/changelog.d/10370.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix some links in `docs` and `contrib`.
\ No newline at end of file
diff --git a/changelog.d/10380.misc b/changelog.d/10380.misc
deleted file mode 100644
index eed2d8552a..0000000000
--- a/changelog.d/10380.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert internal type variable syntax to reflect wider ecosystem use.
\ No newline at end of file
diff --git a/changelog.d/10381.misc b/changelog.d/10381.misc
deleted file mode 100644
index eed2d8552a..0000000000
--- a/changelog.d/10381.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert internal type variable syntax to reflect wider ecosystem use.
\ No newline at end of file
diff --git a/changelog.d/10382.misc b/changelog.d/10382.misc
deleted file mode 100644
index eed2d8552a..0000000000
--- a/changelog.d/10382.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert internal type variable syntax to reflect wider ecosystem use.
\ No newline at end of file
diff --git a/changelog.d/10383.misc b/changelog.d/10383.misc
deleted file mode 100644
index 952c1e77a8..0000000000
--- a/changelog.d/10383.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make the Github Actions workflow configuration more efficient.
diff --git a/changelog.d/10385.misc b/changelog.d/10385.misc
deleted file mode 100644
index e515ac09fd..0000000000
--- a/changelog.d/10385.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to `get_{domain,localpart}_from_id`.
diff --git a/changelog.d/10386.removal b/changelog.d/10386.removal
deleted file mode 100644
index 800a6143d7..0000000000
--- a/changelog.d/10386.removal
+++ /dev/null
@@ -1 +0,0 @@
-The third-party event rules module interface is deprecated in favour of the generic module interface introduced in Synapse v1.37.0. See the [upgrade notes](https://matrix-org.github.io/synapse/latest/upgrade.html#upgrading-to-v1390) for more information.
diff --git a/changelog.d/10391.misc b/changelog.d/10391.misc
deleted file mode 100644
index 3f191b520a..0000000000
--- a/changelog.d/10391.misc
+++ /dev/null
@@ -1 +0,0 @@
-When building Debian packages for prerelease versions, set the Section accordingly.
diff --git a/changelog.d/10393.misc b/changelog.d/10393.misc
deleted file mode 100644
index e80f16d607..0000000000
--- a/changelog.d/10393.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints and comments to event auth code.
diff --git a/changelog.d/10395.doc b/changelog.d/10395.doc
deleted file mode 100644
index 4bdaea76c5..0000000000
--- a/changelog.d/10395.doc
+++ /dev/null
@@ -1 +0,0 @@
-Make deprecation notice of the spam checker doc more obvious.
diff --git a/changelog.d/10396.doc b/changelog.d/10396.doc
deleted file mode 100644
index b521ad9cbf..0000000000
--- a/changelog.d/10396.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add instructructions on installing Debian packages for release candidates.
diff --git a/changelog.d/10398.misc b/changelog.d/10398.misc
deleted file mode 100644
index 326e54655a..0000000000
--- a/changelog.d/10398.misc
+++ /dev/null
@@ -1 +0,0 @@
-Stagger sending of presence update to remote servers, reducing CPU spikes caused by starting many connections to remote servers at once.
diff --git a/changelog.d/10399.doc b/changelog.d/10399.doc
deleted file mode 100644
index b596ac5627..0000000000
--- a/changelog.d/10399.doc
+++ /dev/null
@@ -1 +0,0 @@
-Rewrite the text of links to be clearer in the documentation.
diff --git a/changelog.d/10400.bugfix b/changelog.d/10400.bugfix
deleted file mode 100644
index bfebed8d29..0000000000
--- a/changelog.d/10400.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a number of logged errors caused by remote servers being down.
diff --git a/changelog.d/10404.bugfix b/changelog.d/10404.bugfix
deleted file mode 100644
index 2e095b6402..0000000000
--- a/changelog.d/10404.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Responses from `/make_{join,leave,knock}` no longer include signatures, which will turn out to be invalid after events are returned to `/send_{join,leave,knock}`.
diff --git a/changelog.d/10414.bugfix b/changelog.d/10414.bugfix
deleted file mode 100644
index bfebed8d29..0000000000
--- a/changelog.d/10414.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a number of logged errors caused by remote servers being down.
diff --git a/changelog.d/10418.misc b/changelog.d/10418.misc
deleted file mode 100644
index eed2d8552a..0000000000
--- a/changelog.d/10418.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert internal type variable syntax to reflect wider ecosystem use.
\ No newline at end of file
diff --git a/changelog.d/10421.misc b/changelog.d/10421.misc
deleted file mode 100644
index 385cbe07af..0000000000
--- a/changelog.d/10421.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused `events_by_room` code (tech debt).
diff --git a/changelog.d/10427.feature b/changelog.d/10427.feature
deleted file mode 100644
index 091947ff22..0000000000
--- a/changelog.d/10427.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a new version of the R30 phone-home metric, which removes a false impression of retention given by the old R30 metric.
diff --git a/changelog.d/10430.misc b/changelog.d/10430.misc
deleted file mode 100644
index a017cf4ac9..0000000000
--- a/changelog.d/10430.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a github actions job recording success of other jobs.
diff --git a/changelog.d/9721.removal b/changelog.d/9721.removal
deleted file mode 100644
index da2ba48c84..0000000000
--- a/changelog.d/9721.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove functionality associated with the unused `room_stats_historical` and `user_stats_historical` tables. Contributed by @xmunoz.
diff --git a/changelog.d/9884.feature b/changelog.d/9884.feature
deleted file mode 100644
index 525fd2f93c..0000000000
--- a/changelog.d/9884.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a module type for the account validity feature.
diff --git a/changelog.d/9971.doc b/changelog.d/9971.doc
deleted file mode 100644
index ada68f70ca..0000000000
--- a/changelog.d/9971.doc
+++ /dev/null
@@ -1 +0,0 @@
-Updated installation dependencies for newer macOS versions and ARM Macs. Contributed by Luke Walsh.
-- 
cgit 1.4.1


From 54389d5697622f1beffaeda96d9c6da7ef7d93a9 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 20 Jul 2021 14:24:25 +0100
Subject: Fix dropping locks on shut down (#10433)

---
 changelog.d/10433.bugfix                  |  1 +
 synapse/storage/databases/main/lock.py    |  6 +++++-
 tests/storage/databases/main/test_lock.py | 13 +++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/10433.bugfix

(limited to 'changelog.d')

diff --git a/changelog.d/10433.bugfix b/changelog.d/10433.bugfix
new file mode 100644
index 0000000000..ad85a83f96
--- /dev/null
+++ b/changelog.d/10433.bugfix
@@ -0,0 +1 @@
+Fix error while dropping locks on shutdown. Introduced in v1.38.0.
diff --git a/synapse/storage/databases/main/lock.py b/synapse/storage/databases/main/lock.py
index 774861074c..3d1dff660b 100644
--- a/synapse/storage/databases/main/lock.py
+++ b/synapse/storage/databases/main/lock.py
@@ -78,7 +78,11 @@ class LockStore(SQLBaseStore):
         """Called when the server is shutting down"""
         logger.info("Dropping held locks due to shutdown")
 
-        for (lock_name, lock_key), token in self._live_tokens.items():
+        # We need to take a copy of the tokens dict as dropping the locks will
+        # cause the dictionary to change.
+        tokens = dict(self._live_tokens)
+
+        for (lock_name, lock_key), token in tokens.items():
             await self._drop_lock(lock_name, lock_key, token)
 
         logger.info("Dropped locks due to shutdown")
diff --git a/tests/storage/databases/main/test_lock.py b/tests/storage/databases/main/test_lock.py
index 9ca70e7367..d326a1d6a6 100644
--- a/tests/storage/databases/main/test_lock.py
+++ b/tests/storage/databases/main/test_lock.py
@@ -98,3 +98,16 @@ class LockTestCase(unittest.HomeserverTestCase):
 
         lock2 = self.get_success(self.store.try_acquire_lock("name", "key"))
         self.assertIsNotNone(lock2)
+
+    def test_shutdown(self):
+        """Test that shutting down Synapse releases the locks"""
+        # Acquire two locks
+        lock = self.get_success(self.store.try_acquire_lock("name", "key1"))
+        self.assertIsNotNone(lock)
+        lock2 = self.get_success(self.store.try_acquire_lock("name", "key2"))
+        self.assertIsNotNone(lock2)
+
+        # Now call the shutdown code
+        self.get_success(self.store._on_shutdown())
+
+        self.assertEqual(self.store._live_tokens, {})
-- 
cgit 1.4.1


From f2501f1972b911abbd94fed8d9a11aeccc83b25e Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Tue, 20 Jul 2021 14:27:46 +0100
Subject: Incorporate changelog of #10433

---
 CHANGES.md               | 1 +
 changelog.d/10433.bugfix | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 changelog.d/10433.bugfix

(limited to 'changelog.d')

diff --git a/CHANGES.md b/CHANGES.md
index 871b8d8b94..066f798a95 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Features
 Bugfixes
 --------
 
+- Fix error while dropping locks on shutdown. Introduced in v1.38.0. ([\#10433](https://github.com/matrix-org/synapse/issues/10433))
 - Add base starting insertion event when no chunk ID is specified in the historical batch send API. ([\#10250](https://github.com/matrix-org/synapse/issues/10250))
 - Fix historical batch send endpoint (MSC2716) rejecting batches with messages from multiple senders. ([\#10276](https://github.com/matrix-org/synapse/issues/10276))
 - Fix purging rooms that other homeservers are still sending events for. Contributed by @ilmari. ([\#10317](https://github.com/matrix-org/synapse/issues/10317))
diff --git a/changelog.d/10433.bugfix b/changelog.d/10433.bugfix
deleted file mode 100644
index ad85a83f96..0000000000
--- a/changelog.d/10433.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error while dropping locks on shutdown. Introduced in v1.38.0.
-- 
cgit 1.4.1