diff options
| author | reivilibre <oliverw@matrix.org> | 2022-08-24 09:09:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 09:09:59 +0000 |
| commit | ba882c03579e96a97568fca3551207690b302b30 (patch) | |
| tree | e4d2dca9cfb16f6c1e567333456b4e9963442a51 | |
| parent | Instrument `_check_sigs_and_hash_and_fetch` to trace time spent in child conc... (diff) | |
| download | synapse-ba882c03579e96a97568fca3551207690b302b30.tar.xz | |
Faster Room Joins: fix `/make_knock` blocking indefinitely when the room in question is a partial-stated room. (#13583)
Co-authored-by: Sean Quah <8349537+squahtx@users.noreply.github.com>
| -rw-r--r-- | changelog.d/13583.bugfix | 1 | ||||
| -rw-r--r-- | synapse/federation/federation_server.py | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/changelog.d/13583.bugfix b/changelog.d/13583.bugfix new file mode 100644 index 0000000000..1e4ce5904b --- /dev/null +++ b/changelog.d/13583.bugfix @@ -0,0 +1 @@ +Faster Room Joins: fix `/make_knock` blocking indefinitely when the room in question is a partial-stated room. \ No newline at end of file diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 75fbc6073d..3bf84cf625 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -763,6 +763,17 @@ class FederationServer(FederationBase): The partial knock event. """ origin_host, _ = parse_server_name(origin) + + if await self.store.is_partial_state_room(room_id): + # Before we do anything: check if the room is partial-stated. + # Note that at the time this check was added, `on_make_knock_request` would + # block due to https://github.com/matrix-org/synapse/issues/12997. + raise SynapseError( + 404, + "Unable to handle /make_knock right now; this server is not fully joined.", + errcode=Codes.NOT_FOUND, + ) + await self.check_server_matches_acl(origin_host, room_id) room_version = await self.store.get_room_version(room_id) |