diff options
| author | Erik Johnston <erik@matrix.org> | 2021-07-09 10:16:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 10:16:54 +0100 |
| commit | 1579fdd54a9aab6b65ddb8de4e83b61c3384e2fe (patch) | |
| tree | 9e6f9067a49845cb0ae0c4b4305fece35cb86fe1 | |
| parent | Fix broken links in INSTALL.md (#10331) (diff) | |
| download | synapse-1579fdd54a9aab6b65ddb8de4e83b61c3384e2fe.tar.xz | |
Ensure we always drop the federation inbound lock (#10336)
| -rw-r--r-- | changelog.d/10336.bugfix | 1 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 1 | ||||
| -rw-r--r-- | synapse/storage/databases/main/lock.py | 15 |
3 files changed, 15 insertions, 2 deletions
diff --git a/changelog.d/10336.bugfix b/changelog.d/10336.bugfix new file mode 100644 index 0000000000..5e75ed3335 --- /dev/null +++ b/changelog.d/10336.bugfix @@ -0,0 +1 @@ +Fix bug where inbound federation in a room could be delayed due to not correctly dropping a lock. Introduced in v1.37.1. diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index bf67d0f574..ac0f2ccfb3 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -949,6 +949,7 @@ class FederationServer(FederationBase): room_id, room_version ) if not next: + await lock.release() return origin, event = next diff --git a/synapse/storage/databases/main/lock.py b/synapse/storage/databases/main/lock.py index e76188328c..774861074c 100644 --- a/synapse/storage/databases/main/lock.py +++ b/synapse/storage/databases/main/lock.py @@ -310,14 +310,25 @@ class Lock: _excinst: Optional[BaseException], _exctb: Optional[TracebackType], ) -> bool: + await self.release() + + return False + + async def release(self) -> None: + """Release the lock. + + This is automatically called when using the lock as a context manager. + """ + + if self._dropped: + return + if self._looping_call.running: self._looping_call.stop() await self._store._drop_lock(self._lock_name, self._lock_key, self._token) self._dropped = True - return False - def __del__(self) -> None: if not self._dropped: # We should not be dropped without the lock being released (unless |