From 5db717ab8569a9e16cfbb589d50f80bceed00d2a Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 2 Nov 2021 21:26:52 -0500 Subject: Always process marker events regardless if backfilled Before, we could rely on the `connected_insertion_event_query` to navigate the and find the historical branch. But now we solely rely on the marker event to point out the historical branch. So we need to make sure to add the insertion event extremeties whenever we see a marker event. Whether it be a live event or backfilled. --- synapse/handlers/federation.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'synapse/handlers/federation.py') diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 2dc5e64a39..7bc11f736f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -142,7 +142,7 @@ class FederationHandler: insertion_events_to_be_backfilled: Dict[str, int] = {} if self.hs.config.experimental.msc2716_enabled: insertion_events_to_be_backfilled = ( - await self.store.get_insertion_event_backwards_extremities_in_room( + await self.store.get_insertion_event_backward_extremities_in_room( room_id ) ) @@ -1055,8 +1055,8 @@ class FederationHandler: limit = min(limit, 100) events = await self.store.get_backfill_events(room_id, pdu_list, limit) - logger.info( - "old implementation backfill events=%s", + logger.debug( + "on_backfill_request: backfill events=%s", [ "event_id=%s,depth=%d,body=%s,prevs=%s\n" % ( -- cgit 1.5.1