From 71475dba8de96ca2b9a6f9a87cca3d968f6828b6 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Mon, 6 Feb 2023 15:53:08 +0100 Subject: [PATCH 1/2] Increase timeout for client fed requests known to be long to answer /send_join, /state_ids mainly, it was done recently for /state. --- synapse/federation/transport/client.py | 6 ++++++ 1 file changed, 6 insertions(+) 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), ) From 26bc8bfc024f21dfd41bd4d62f887794aa62fb79 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Mon, 6 Feb 2023 15:58:55 +0100 Subject: [PATCH 2/2] Add changelog --- changelog.d/15001.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15001.misc diff --git a/changelog.d/15001.misc b/changelog.d/15001.misc new file mode 100644 index 0000000000..c20faf2358 --- /dev/null +++ b/changelog.d/15001.misc @@ -0,0 +1 @@ +Increase client timeout for potentially long federation requests. It should improve joining behavior of big rooms.