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.

1 files changed, 5 insertions, 5 deletions

diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py

index f219a0f42a..9ccf99f5c5 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -752,9 +752,9 @@ class FederationEventHandler:
             backfilled: True if this is part of a historical batch of events (inhibits
                 notification to clients, and validation of device keys.)
         """
-
-        logger.info(
-            "backfill events=%s",
+        logger.debug(
+            "processing pulled backfilled=%s events=%s",
+            backfilled,
             [
                 "event_id=%s,depth=%d,body=%s,prevs=%s\n"
                 % (
@@ -1146,6 +1146,8 @@ class FederationEventHandler:
 
         await self._run_push_actions_and_persist_event(event, context, backfilled)
 
+        await self._handle_marker_event(origin, event)
+
         if backfilled:
             return
 
@@ -1223,8 +1225,6 @@ class FederationEventHandler:
                     event.sender,
                 )
 
-        await self._handle_marker_event(origin, event)
-
     async def _resync_device(self, sender: str) -> None:
         """We have detected that the device list for the given user may be out
         of sync, so we try and resync them.