summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@matrix.org>2023-09-29 14:52:48 +0300
committerGitHub <noreply@github.com>2023-09-29 11:52:48 +0000
commit20fb08ec803c324a58e0f972935a27debaac133f (patch)
tree779302f0ec73919fa8d6e8f95328acee4e8d1e3b
parentSupport rendering some media downloads as inline (#15988) (diff)
downloadsynapse-20fb08ec803c324a58e0f972935a27debaac133f.tar.xz
Downgrade repl stream time out error to warning (#16401)
This is because if a worker reaches ~100% CPU then everything starts
lagging and we hit the log line a lot. When at error we invoke sentry
and that has a lot of overhead, which then puts even more pressure on
the worker.
-rw-r--r--changelog.d/16401.misc1
-rw-r--r--synapse/replication/tcp/client.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/16401.misc b/changelog.d/16401.misc
new file mode 100644
index 0000000000..86d2749a08
--- /dev/null
+++ b/changelog.d/16401.misc
@@ -0,0 +1 @@
+Downgrade replication stream time out error log lines to warning.
diff --git a/synapse/replication/tcp/client.py b/synapse/replication/tcp/client.py
index 1c7946522a..f4f2b29e96 100644
--- a/synapse/replication/tcp/client.py
+++ b/synapse/replication/tcp/client.py
@@ -339,7 +339,7 @@ class ReplicationDataHandler:
             try:
                 await make_deferred_yieldable(deferred)
             except defer.TimeoutError:
-                logger.error(
+                logger.warning(
                     "Timed out waiting for repl stream %r to reach %s (%s)"
                     "; currently at: %s",
                     stream_name,