Some more trials of trying to get many many events to backfill in order on remote

This commit is contained in:
Eric Eastwood 2021-10-19 01:55:40 -05:00
parent a64bb2e811
commit 260ca06f0f
4 changed files with 9 additions and 10 deletions

View file

@ -449,7 +449,9 @@ class FederationEventHandler:
# persist the backfilled events without constantly have to go fetch
# missing prev_events which are probably included in the same
# backfill chunk.
reversed(events),
# TODO: If we try to reverse this list, the stream_ordering will be backwards
# reversed(events),
events,
backfilled=True,
)
@ -1271,7 +1273,12 @@ class FederationEventHandler:
return event, context
events_to_persist = (x for x in (prep(event) for event in fetched_events) if x)
await self.persist_events_and_notify(room_id, tuple(events_to_persist))
await self.persist_events_and_notify(
room_id,
tuple(events_to_persist),
# TODO: Maybe this to get fetched missing events during backfill as backfill also :/
backfilled=True,
)
async def _check_event_auth(
self,

View file

@ -586,7 +586,6 @@ class RoomMessageListRestServlet(RestServlet):
event_filter=event_filter,
)
logger.info("/messages rest end msgs=%s", msgs)
return 200, msgs

View file

@ -1166,7 +1166,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore, metaclass=abc.ABCMeta):
"order": order,
}
logger.info("stream: getting events sql=%s args=%s", sql, args)
txn.execute(sql, args)
# Filter the result set.
@ -1237,7 +1236,6 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore, metaclass=abc.ABCMeta):
event_filter,
)
logger.info("paginate_room_events event_ids(%d)=%s", len(rows), [r.event_id for r in rows])
events = await self.get_events_as_list(
[r.event_id for r in rows], get_prev_content=True
)

View file

@ -309,11 +309,6 @@ class EventsPersistenceStorage:
matched the transcation ID; the existing event is returned in such
a case.
"""
# logger.info(
# "persist_events backfilled=%s events_and_contexts=%s",
# backfilled,
# events_and_contexts,
# )
partitioned: Dict[str, List[Tuple[EventBase, EventContext]]] = {}
for event, ctx in events_and_contexts:
partitioned.setdefault(event.room_id, []).append((event, ctx))