diff options
| author | David Robertson <davidr@element.io> | 2023-03-13 12:44:50 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2023-03-13 12:44:50 +0000 |
| commit | b4df6be0d00d10b791c6c2bffd7dfa0269aba2c7 (patch) | |
| tree | 916661272a63b1e86d05ab1a24a2b0a5ce223e25 | |
| parent | Hack to workaround libera federation pain (diff) | |
| download | synapse-b4df6be0d00d10b791c6c2bffd7dfa0269aba2c7.tar.xz | |
Revert "Hack to workaround libera federation pain"
This reverts commit ab629c17ccfbc98e8297e7fd3fcf03b641bd3cc0.
| -rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 9bfa0bb757..ffc9d95ee7 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -509,17 +509,6 @@ 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) |