diff options
| author | David Robertson <davidr@element.io> | 2023-03-07 19:49:14 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2023-03-07 19:49:14 +0000 |
| commit | ab629c17ccfbc98e8297e7fd3fcf03b641bd3cc0 (patch) | |
| tree | 731f7441290719b53e88227c3d51e2689a2cde1f | |
| parent | Merge remote-tracking branch 'origin/release-v1.79' into matrix-org-hotfixes (diff) | |
| download | synapse-ab629c17ccfbc98e8297e7fd3fcf03b641bd3cc0.tar.xz | |
Hack to workaround libera federation pain
as seen in https://github.com/matrix-org/synapse/issues/15216
| -rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index ffc9d95ee7..9bfa0bb757 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -509,6 +509,17 @@ class PerDestinationQueue: # servers, but the remote will correctly deduplicate them and # handle it only once. + # TEMPORARY HACK: the loop body below can block during partial state + # resyncs. This is bad---other, fully joined rooms have their federation + # sending nobbled. As a stopgap, ignore partial state rooms here. + # Any queued messages in rooms that we skip won't be sent to this + # destination; they'll wait for us to send a new event in the room. + if await self._store.is_partial_state_room(pdu.room_id): + logger.warning( + "SKIPPING CATCHUP FOR PARTIAL STATE ROOM: %s", pdu.room_id + ) + continue + # Step 1, fetch the current extremities extrems = await self._store.get_prev_events_for_room(pdu.room_id) |