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

limit total timeout for get_missing_events to 10s #1744

Merged
merged 2 commits into from
Jan 5, 2017

Conversation

ara4n
Copy link
Member

@ara4n ara4n commented Dec 31, 2016

timeout calls to get_missing_events from the federation client after 10s rather than the current 5 minutes. should improve the workaround for #1733 and #1729 some more.

@NegativeMjark
Copy link
Contributor

It might be worth noting in the comment that this disables HTTP client retries entirely.
https://github.com/matrix-org/synapse/blob/master/synapse/http/matrixfederationclient.py#L189

Also worth noting in the comment that this increases the chances of falling back to fetching state, which curiously isn't guarded by the same lock as the get_missing_events.

Also might be worth mentioning in the comment that we don't want to block for a long time because we are holding a lock on the room that could block other transactions that needed to fetch missing events.

Other than lack of comments LGTM.

@ara4n
Copy link
Member Author

ara4n commented Jan 5, 2017

will fix #1741 when merged

@ara4n
Copy link
Member Author

ara4n commented Jan 5, 2017

@NegativeMjark have updated the comment - PTAL

@NegativeMjark
Copy link
Contributor

LGTM

@NegativeMjark NegativeMjark merged commit 5175094 into develop Jan 5, 2017
NegativeMjark added a commit that referenced this pull request Jan 5, 2017
…vents

cherrypick #1744: limit total timeout for get_missing_events to 10s
@hawkowl hawkowl deleted the matthew/timeout_get_missing_events branch September 20, 2018 13:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants