diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-28 11:04:38 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-28 11:38:33 +0100 |
commit | 4e0fd35bc918b6901fcd29371ab6d89db8ce1b5e (patch) | |
tree | e1df2098f2da2302312f2a2a024e88ad6c8a099c /synapse/federation/sender/per_destination_queue.py | |
parent | Remove various bits of compatibility code for Python <3.6 (#9879) (diff) | |
download | synapse-4e0fd35bc918b6901fcd29371ab6d89db8ce1b5e.tar.xz |
Revert "Experimental Federation Speedup (#9702)"
This reverts commit 05e8c70c059f8ebb066e029bc3aa3e0cefef1019.
Diffstat (limited to 'synapse/federation/sender/per_destination_queue.py')
-rw-r--r-- | synapse/federation/sender/per_destination_queue.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py index 3bb66bce32..3b053ebcfb 100644 --- a/synapse/federation/sender/per_destination_queue.py +++ b/synapse/federation/sender/per_destination_queue.py @@ -154,22 +154,19 @@ class PerDestinationQueue: + len(self._pending_edus_keyed) ) - def send_pdus(self, pdus: Iterable[EventBase]) -> None: - """Add PDUs to the queue, and start the transmission loop if necessary + def send_pdu(self, pdu: EventBase) -> None: + """Add a PDU to the queue, and start the transmission loop if necessary Args: - pdus: pdus to send + pdu: pdu to send """ if not self._catching_up or self._last_successful_stream_ordering is None: # only enqueue the PDU if we are not catching up (False) or do not # yet know if we have anything to catch up (None) - self._pending_pdus.extend(pdus) + self._pending_pdus.append(pdu) else: - self._catchup_last_skipped = max( - pdu.internal_metadata.stream_ordering - for pdu in pdus - if pdu.internal_metadata.stream_ordering is not None - ) + assert pdu.internal_metadata.stream_ordering + self._catchup_last_skipped = pdu.internal_metadata.stream_ordering self.attempt_new_transaction() |