diff options
| author | David Robertson <davidr@element.io> | 2022-04-26 15:53:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 15:53:06 +0100 |
| commit | 6d89f1239ce5ebe83b085a2b8939b2b6ce461265 (patch) | |
| tree | aa1424da41ffae5c79ce2967c5a003d5d79de114 | |
| parent | Fix sending opentracing contexts to remote servers (#12555) (diff) | |
| download | synapse-6d89f1239ce5ebe83b085a2b8939b2b6ce461265.tar.xz | |
Comment out dodgy log-kv (#12554)
| -rw-r--r-- | changelog.d/12554.bugfix | 1 | ||||
| -rw-r--r-- | synapse/handlers/device.py | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changelog.d/12554.bugfix b/changelog.d/12554.bugfix new file mode 100644 index 0000000000..48c1146db5 --- /dev/null +++ b/changelog.d/12554.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in Synapse 1.58.0rc1 where the main process could consume excessive amounts of CPU and memory handling sentry logging failures. diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 3c0fc756d4..319836da2b 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -683,9 +683,12 @@ class DeviceHandler(DeviceWorkerHandler): self.federation_sender.send_device_messages( host, immediate=False ) - log_kv( - {"message": "sent device update to host", "host": host} - ) + # TODO: when called, this isn't in a logging context. + # This leads to log spam, sentry event spam, and massive + # memory usage. See #12552. + # log_kv( + # {"message": "sent device update to host", "host": host} + # ) if current_stream_id != stream_id: # Clear the set of hosts we've already sent to as we're |