Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Bump the client-side timeout for /state #14912

Merged
DMRobertson merged 3 commits into from
Jan 25, 2023
Merged

Bump the client-side timeout for /state #14912

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16a4473
Bump the client-side timeout for /state
Jan 25, 2023
840ba65
Changelog
Jan 25, 2023
5d8486d
Milliseconds!!!!
Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/14912.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster joins: allow the resync process more time to fetch `/state` ids.
4 changes: 4 additions & 0 deletions synapse/federation/transport/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ async def get_room_state(
destination,
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,
Copy link
Copy Markdown
Member

@clokep clokep Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is in milliseconds?

Suggested change
timeout=600,
timeout=60000,

Copy link
Copy Markdown
Contributor Author

@DMRobertson DMRobertson Jan 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, it is. Which is confusing, because default_timeout isi in seconds:

synapse/synapse/http/matrixfederationclient.py

Line 369 in d8cc86e

self.default_timeout = 60

parser=_StateParser(room_version),
)

Expand Down