mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-22 10:15:33 +00:00
Merge pull request #3903 from matrix-org/rav/increase_get_missing_events_timeout
Bump timeout on get_missing_events request
This commit is contained in:
commit
f773ecbd61
1
changelog.d/3903.misc
Normal file
1
changelog.d/3903.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Increase the timeout when filling missing events in federation requests
|
@ -360,6 +360,35 @@ class FederationHandler(BaseHandler):
|
|||||||
# apparently.
|
# apparently.
|
||||||
#
|
#
|
||||||
# see https://github.com/matrix-org/synapse/pull/1744
|
# see https://github.com/matrix-org/synapse/pull/1744
|
||||||
|
#
|
||||||
|
# ----
|
||||||
|
#
|
||||||
|
# Update richvdh 2018/09/18: There are a number of problems with timing this
|
||||||
|
# request out agressively on the client side:
|
||||||
|
#
|
||||||
|
# - it plays badly with the server-side rate-limiter, which starts tarpitting you
|
||||||
|
# if you send too many requests at once, so you end up with the server carefully
|
||||||
|
# working through the backlog of your requests, which you have already timed
|
||||||
|
# out.
|
||||||
|
#
|
||||||
|
# - for this request in particular, we now (as of
|
||||||
|
# https://github.com/matrix-org/synapse/pull/3456) reject any PDUs where the
|
||||||
|
# server can't produce a plausible-looking set of prev_events - so we becone
|
||||||
|
# much more likely to reject the event.
|
||||||
|
#
|
||||||
|
# - contrary to what it says above, we do *not* fall back to fetching fresh state
|
||||||
|
# for the room if get_missing_events times out. Rather, we give up processing
|
||||||
|
# the PDU whose prevs we are missing, which then makes it much more likely that
|
||||||
|
# we'll end up back here for the *next* PDU in the list, which exacerbates the
|
||||||
|
# problem.
|
||||||
|
#
|
||||||
|
# - the agressive 10s timeout was introduced to deal with incoming federation
|
||||||
|
# requests taking 8 hours to process. It's not entirely clear why that was going
|
||||||
|
# on; certainly there were other issues causing traffic storms which are now
|
||||||
|
# resolved, and I think in any case we may be more sensible about our locking
|
||||||
|
# now. We're *certainly* more sensible about our logging.
|
||||||
|
#
|
||||||
|
# All that said: Let's try increasing the timout to 60s and see what happens.
|
||||||
|
|
||||||
missing_events = yield self.federation_client.get_missing_events(
|
missing_events = yield self.federation_client.get_missing_events(
|
||||||
origin,
|
origin,
|
||||||
@ -368,7 +397,7 @@ class FederationHandler(BaseHandler):
|
|||||||
latest_events=[pdu],
|
latest_events=[pdu],
|
||||||
limit=10,
|
limit=10,
|
||||||
min_depth=min_depth,
|
min_depth=min_depth,
|
||||||
timeout=10000,
|
timeout=60000,
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
|
Loading…
Reference in New Issue
Block a user