Merge remote-tracking branch 'origin/dmr/bump-state-timeouts' into matrix-org-hotfixes

2023-01-25 15:29:55 +00:00 · 2023-01-25 15:29:55 +00:00 · 505d85e0db
parent 8d6bb6e8ee 5d8486d43e
commit 505d85e0db
1 changed files with 3 additions and 3 deletions
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@ -103,9 +103,9 @@ class TransportLayerClient:
            path=path,
            args={"event_id": event_id},
            # This can take a looooooong time for large rooms. Give this a generous
-            # timeout, to avoid the partial state resync timing out early and trying
-            # a bunch of servers who haven't see our join yet.
-            timeout=600,
+            # timeout of 10 minutes to avoid the partial state resync timing out early
+            # and trying a bunch of servers who haven't seen our join yet.
+            timeout=600_000,
            parser=_StateParser(room_version),
        )