summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2023-02-06 15:53:08 +0100
committerMathieu Velten <mathieuv@matrix.org>2023-02-06 15:53:08 +0100
commit71475dba8de96ca2b9a6f9a87cca3d968f6828b6 (patch)
tree1f616da2587eb552c13d515a2d2af7485a8f37af
parentExpect type stubs from canonicaljson (#14992) (diff)
downloadsynapse-71475dba8de96ca2b9a6f9a87cca3d968f6828b6.tar.xz
Increase timeout for client fed requests known to be long to answer
/send_join, /state_ids mainly, it was done recently for /state.
-rw-r--r--synapse/federation/transport/client.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index c05d598b70..61fc8666e1 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -79,6 +79,8 @@ class TransportLayerClient:
             destination,
             path=path,
             args={"event_id": event_id},
+            # This can take a looooooong time for large rooms.
+            timeout=600_000,
             try_trailing_slash_on_400=True,
         )
 
@@ -345,6 +347,8 @@ class TransportLayerClient:
             destination=destination,
             path=path,
             data=content,
+            # This can take a looooooong time for large rooms.
+            timeout=600_000,
             parser=SendJoinParser(room_version, v1_api=True),
         )
 
@@ -371,6 +375,8 @@ class TransportLayerClient:
             path=path,
             args=query_params,
             data=content,
+            # This can take a looooooong time for large rooms.
+            timeout=600_000,
             parser=SendJoinParser(room_version, v1_api=False),
         )