Limit number of events in a replication request (#10118)

Fixes #9956.
matrix-org · Jun 4, 2021 · c96ab31 · c96ab31
1 parent d8be7d4
commit c96ab31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changelog.d/10118.bugfix b/changelog.d/10118.bugfix
@@ -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.
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
@@ -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,