Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 19:34:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor typing fixes (#12034)

Browse source 
These started failing in
https://github.com/matrix-org/synapse/pull/12031... I'm a bit mystified by how
they ever worked.
This commit is contained in:
Richard van der Hoff 2022-02-21 18:37:04 +00:00 • committed by GitHub
parent 7c82da27aa
commit a85dde3445
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
synapse/federation/sender/per_destination_queue.py
View file

@ -381,7 +381,9 @@ class PerDestinationQueue:
)
)
if self._last_successful_stream_ordering is None:
last_successful_stream_ordering = self._last_successful_stream_ordering
if last_successful_stream_ordering is None:
# if it's still None, then this means we don't have the information
# in our database ­ we haven't successfully sent a PDU to this server
# (at least since the introduction of the feature tracking
@ -394,8 +396,7 @@ class PerDestinationQueue:
# get at most 50 catchup room/PDUs
while True:
event_ids = await self._store.get_catch_up_room_event_ids(
self._destination,
self._last_successful_stream_ordering,
self._destination, last_successful_stream_ordering
)
if not event_ids:
@ -403,7 +404,7 @@ class PerDestinationQueue:
# of a race condition, so we check that no new events have been
# skipped due to us being in catch-up mode
if self._catchup_last_skipped > self._last_successful_stream_ordering:
if self._catchup_last_skipped > last_successful_stream_ordering:
# another event has been skipped because we were in catch-up mode
continue
@ -470,7 +471,7 @@ class PerDestinationQueue:
# offline
if (
p.internal_metadata.stream_ordering
< self._last_successful_stream_ordering
< last_successful_stream_ordering
):
continue
@ -513,12 +514,11 @@ class PerDestinationQueue:
# from the *original* PDU, rather than the PDU(s) we actually
# send. This is because we use it to mark our position in the
# queue of missed PDUs to process.
self._last_successful_stream_ordering = (
pdu.internal_metadata.stream_ordering
)
last_successful_stream_ordering = pdu.internal_metadata.stream_ordering
self._last_successful_stream_ordering = last_successful_stream_ordering
await self._store.set_destination_last_successful_stream_ordering(
self._destination, self._last_successful_stream_ordering
self._destination, last_successful_stream_ordering
)
def _get_rr_edus(self, force_flush: bool) -> Iterable[Edu]: