summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-28 16:28:01 +0100
committerGitHub <noreply@github.com>2021-05-28 16:28:01 +0100
commit84cf3e47a0318aba51d9f830d5e724182c5d93c4 (patch)
tree7a3833f554b137db01a2e2169f9715f5e2b599b6 /synapse/federation
parentPass the origin when calculating the spaces summary over GET. (#10079) (diff)
downloadsynapse-84cf3e47a0318aba51d9f830d5e724182c5d93c4.tar.xz
Allow response of `/send_join` to be larger. (#10093)
Fixes #10087.
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/client.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index e93ab83f7f..5b4f5d17f7 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -35,6 +35,11 @@ from synapse.types import JsonDict
 
 logger = logging.getLogger(__name__)
 
+# Send join responses can be huge, so we set a separate limit here. The response
+# is parsed in a streaming manner, which helps alleviate the issue of memory
+# usage a bit.
+MAX_RESPONSE_SIZE_SEND_JOIN = 500 * 1024 * 1024
+
 
 class TransportLayerClient:
     """Sends federation HTTP requests to other servers"""
@@ -261,6 +266,7 @@ class TransportLayerClient:
             path=path,
             data=content,
             parser=SendJoinParser(room_version, v1_api=True),
+            max_response_size=MAX_RESPONSE_SIZE_SEND_JOIN,
         )
 
         return response
@@ -276,6 +282,7 @@ class TransportLayerClient:
             path=path,
             data=content,
             parser=SendJoinParser(room_version, v1_api=False),
+            max_response_size=MAX_RESPONSE_SIZE_SEND_JOIN,
         )
 
         return response