diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index c864991bd1..b82919b46a 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -711,6 +711,37 @@ class FederationEventHandler:
):
event.internal_metadata.stream_ordering = stream
+ logger.info(
+ "backfill chronological_events=%s",
+ [
+ "event_id=%s,depth=%d,stream_ordering=%s,body=%s(%s),prevs=%s\n"
+ % (
+ event.event_id,
+ event.depth,
+ event.internal_metadata.stream_ordering,
+ event.content.get("body", event.type),
+ getattr(event, "state_key", None),
+ event.prev_event_ids(),
+ )
+ for event in chronological_events
+ ],
+ )
+ logger.info(
+ "backfill reverse_chronological_events=%s",
+ [
+ "event_id=%s,depth=%d,stream_ordering=%s,body=%s(%s),prevs=%s\n"
+ % (
+ event.event_id,
+ event.depth,
+ event.internal_metadata.stream_ordering,
+ event.content.get("body", event.type),
+ getattr(event, "state_key", None),
+ event.prev_event_ids(),
+ )
+ for event in reverse_chronological_events
+ ],
+ )
+
await self._process_pulled_events(
dest,
# Expecting to persist in chronological order here (oldest ->
@@ -869,13 +900,14 @@ class FederationEventHandler:
sorted_events = sorted(events, key=lambda x: x.depth)
logger.info(
- "backfill sorted_events=%s",
+ "_process_pulled_events backfill sorted_events=%s",
json.dumps(
[
- "event_id=%s,depth=%d,body=%s(%s),prevs=%s\n"
+ "event_id=%s,depth=%d,stream_ordering=%s,body=%s(%s),prevs=%s\n"
% (
event.event_id,
event.depth,
+ event.internal_metadata.stream_ordering,
event.content.get("body", event.type),
getattr(event, "state_key", None),
event.prev_event_ids(),
diff --git a/tests/handlers/test_federation_event.py b/tests/handlers/test_federation_event.py
index 200c919564..1348d6bea7 100644
--- a/tests/handlers/test_federation_event.py
+++ b/tests/handlers/test_federation_event.py
@@ -1222,6 +1222,9 @@ class FederationEventHandlerTests(unittest.FederatingHomeserverTestCase):
if event.internal_metadata.outlier:
self.fail("Our pristine events should not be marked as an outlier")
+ # TODO: We currently don't set the `stream_ordering` on `pulled_events` here
+ # like we normally would via `backfill(..._` before passing it off to
+ # `_process_pulled_events(...)`
self.get_success(
self.hs.get_federation_event_handler()._process_pulled_events(
self.OTHER_SERVER_NAME,
|
