Revert "Fix dropping locks on shut down"

This reverts commit 83f1ccfcab.
This commit is contained in:
Erik Johnston 2021-07-20 12:28:40 +01:00
parent 83f1ccfcab
commit 794371b1bf

View File

@ -78,11 +78,7 @@ class LockStore(SQLBaseStore):
"""Called when the server is shutting down""" """Called when the server is shutting down"""
logger.info("Dropping held locks due to shutdown") logger.info("Dropping held locks due to shutdown")
# We need to take a copy of the tokens dict as dropping the locks will for (lock_name, lock_key), token in self._live_tokens.items():
# 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) await self._drop_lock(lock_name, lock_key, token)
logger.info("Dropped locks due to shutdown") logger.info("Dropped locks due to shutdown")