Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Limit number of events in a replication request #10118

Merged
merged 4 commits into from
Jun 4, 2021
Merged

Limit number of events in a replication request #10118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
072382b
Limit number of events in a replication request
erikjohnston Jun 3, 2021
b9554ff
Newsfile
erikjohnston Jun 3, 2021
42de8c4
Update synapse/handlers/federation.py
erikjohnston Jun 4, 2021
57b5e16
Update changelog.d/10118.bugfix
richvdh Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/10118.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.33.0 which caused replication requests to fail when receiving a lot of very large events via federation.
5 changes: 3 additions & 2 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3056,8 +3056,9 @@ async def persist_events_and_notify(
"""
instance = self.config.worker.events_shard_config.get_instance(room_id)
if instance != self._instance_name:
# Limit the number of events sent over federation.
for batch in batch_iter(event_and_contexts, 1000):
# Limit the number of events sent over replication. We choose 200
# here as that is what we default to in `max_request_body_size(..)`
for batch in batch_iter(event_and_contexts, 200):
result = await self._send_events(
instance_name=instance,
store=self.store,
Expand Down