Merge 26bc8bfc02 into be65a8ec01

changelog.d/15001.misc

@@ -0,0 +1 @@
+Increase client timeout for potentially long federation requests. It should improve joining behavior of big rooms.

synapse/federation/transport/client.py

@@ -83,6 +83,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,
         )
 
@@ -351,6 +353,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),
         )
 
@@ -373,6 +377,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),
         )