summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2020-03-06 14:48:04 +0000
committerMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2020-03-06 14:48:04 +0000
commitf0cebd86517be647088a03592880b259d88ea703 (patch)
treea12007bedd0c250a731093c41acae00415ec5556
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
downloadsynapse-michaelkaye/matrix_org_hotfixes_increase_replication_timeout.tar.xz
Initial synchrotrons under high load can timeout due to
servicing a long initial sync, causing errors and reconnections
that are not required.

Increase the timeout to prevent this.
-rw-r--r--synapse/replication/tcp/protocol.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py
index bc1482a9bb..08474ea15e 100644
--- a/synapse/replication/tcp/protocol.py
+++ b/synapse/replication/tcp/protocol.py
@@ -100,7 +100,7 @@ logger = logging.getLogger(__name__)
 
 
 PING_TIME = 5000
-PING_TIMEOUT_MULTIPLIER = 5
+PING_TIMEOUT_MULTIPLIER = 12
 PING_TIMEOUT_MS = PING_TIME * PING_TIMEOUT_MULTIPLIER