From 794371b1bf800353a7a4496dc6aeefb30c50831e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 20 Jul 2021 12:28:40 +0100
Subject: [PATCH] Revert "Fix dropping locks on shut down"
This reverts commit 83f1ccfcaba76785ab4bd91e3177724e2dbb85ed.
---
synapse/storage/databases/main/lock.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/synapse/storage/databases/main/lock.py b/synapse/storage/databases/main/lock.py
index 3d1dff660b..774861074c 100644
--- a/synapse/storage/databases/main/lock.py
+++ b/synapse/storage/databases/main/lock.py
@@ -78,11 +78,7 @@ class LockStore(SQLBaseStore):
"""Called when the server is shutting down"""
logger.info("Dropping held locks due to shutdown")
- # 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():
+ for (lock_name, lock_key), token in self._live_tokens.items():
await self._drop_lock(lock_name, lock_key, token)
logger.info("Dropped locks due to shutdown")
--
GitLab