diff options
| author | Erik Johnston <erik@matrix.org> | 2021-07-20 12:28:00 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-07-20 12:28:00 +0100 |
| commit | 83f1ccfcaba76785ab4bd91e3177724e2dbb85ed (patch) | |
| tree | 8d171b4073ff3782c05b7959233a035d41b694c3 /synapse | |
| parent | Add a github actions job recording success of other jobs. (#10430) (diff) | |
| download | synapse-83f1ccfcaba76785ab4bd91e3177724e2dbb85ed.tar.xz | |
Fix dropping locks on shut down
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/databases/main/lock.py | 6 |
1 files changed, 5 insertions, 1 deletions
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") |