Merge remote-tracking branch 'origin/dmr/bump-state-timeouts' into matrix-org-hotfixes
commit
505d85e0db
|
@ -103,9 +103,9 @@ class TransportLayerClient:
|
||||||
path=path,
|
path=path,
|
||||||
args={"event_id": event_id},
|
args={"event_id": event_id},
|
||||||
# This can take a looooooong time for large rooms. Give this a generous
|
# 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
|
# timeout of 10 minutes to avoid the partial state resync timing out early
|
||||||
# a bunch of servers who haven't see our join yet.
|
# and trying a bunch of servers who haven't seen our join yet.
|
||||||
timeout=600,
|
timeout=600_000,
|
||||||
parser=_StateParser(room_version),
|
parser=_StateParser(room_version),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue