Skip to content

Commit

Permalink
Don't lock up when joining large rooms (#16903)
Browse files Browse the repository at this point in the history
Co-authored-by: Andrew Morgan <[email protected]>
  • Loading branch information
erikjohnston and anoadragon453 authored Feb 20, 2024
1 parent c51a224 commit cdbbf36
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions changelog.d/16903.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix performance issue when joining very large rooms that can cause the server to lock up. Introduced in v1.100.0.
26 changes: 17 additions & 9 deletions synapse/handlers/federation_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -1757,17 +1757,25 @@ async def prep(event: EventBase) -> None:

events_and_contexts_to_persist.append((event, context))

for event in sorted_auth_events:
for i, event in enumerate(sorted_auth_events):
await prep(event)

await self.persist_events_and_notify(
room_id,
events_and_contexts_to_persist,
# Mark these events backfilled as they're historic events that will
# eventually be backfilled. For example, missing events we fetch
# during backfill should be marked as backfilled as well.
backfilled=True,
)
# The above function is typically not async, and so won't yield to
# the reactor. For large rooms let's yield to the reactor
# occasionally to ensure we don't block other work.
if (i + 1) % 1000 == 0:
await self._clock.sleep(0)

# Also persist the new event in batches for similar reasons as above.
for batch in batch_iter(events_and_contexts_to_persist, 1000):
await self.persist_events_and_notify(
room_id,
batch,
# Mark these events as backfilled as they're historic events that will
# eventually be backfilled. For example, missing events we fetch
# during backfill should be marked as backfilled as well.
backfilled=True,
)

@trace
async def _check_event_auth(
Expand Down

0 comments on commit cdbbf36

Please sign in to comment.