summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-02-21 10:17:28 +0000
committerGitHub <noreply@github.com>2020-02-21 10:17:28 +0000
commit272eee1ae1d759302c9a8f82773f247cfe7ac9c0 (patch)
tree759855c0712f055fb9357fe1d75184908f5cf54c
parentMerge branch 'master' into develop (diff)
parentchangelog (diff)
downloadsynapse-272eee1ae1d759302c9a8f82773f247cfe7ac9c0.tar.xz
Merge pull request #6967 from matrix-org/rav/increase_max_events_behind
Increase MAX_EVENTS_BEHIND for replication clients
-rw-r--r--changelog.d/6967.bugfix1
-rw-r--r--synapse/replication/tcp/streams/_base.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6967.bugfix b/changelog.d/6967.bugfix
new file mode 100644
index 0000000000..b65f80cf1d
--- /dev/null
+++ b/changelog.d/6967.bugfix
@@ -0,0 +1 @@
+Fix an issue affecting worker-based deployments where replication would stop working, necessitating a full restart, after joining a large room.
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py
index a8d568b14a..208e8a667b 100644
--- a/synapse/replication/tcp/streams/_base.py
+++ b/synapse/replication/tcp/streams/_base.py
@@ -24,7 +24,7 @@ import attr
 logger = logging.getLogger(__name__)
 
 
-MAX_EVENTS_BEHIND = 10000
+MAX_EVENTS_BEHIND = 500000
 
 BackfillStreamRow = namedtuple(
     "BackfillStreamRow",