diff options
author | Erik Johnston <erik@matrix.org> | 2021-05-20 16:11:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-20 16:11:48 +0100 |
commit | 64887f06fcac63e069364d625d984b4951bf1ffc (patch) | |
tree | eabd30c1ad56d057667271573d3bfc96276d11bd /synapse/http/client.py | |
parent | Allow a user who could join a restricted room to see it in spaces summary. (#... (diff) | |
download | synapse-64887f06fcac63e069364d625d984b4951bf1ffc.tar.xz |
Use ijson to parse the response to `/send_join`, reducing memory usage. (#9958)
Instead of parsing the full response to `/send_join` into Python objects (which can be huge for large rooms) and *then* parsing that into events, we instead use ijson to stream parse the response directly into `EventBase` objects.
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r-- | synapse/http/client.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 5f40f16e24..1ca6624fd5 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -813,7 +813,12 @@ class _ReadBodyWithMaxSizeProtocol(protocol.Protocol): if self.deferred.called: return - self.stream.write(data) + try: + self.stream.write(data) + except Exception: + self.deferred.errback() + return + self.length += len(data) # The first time the maximum size is exceeded, error and cancel the # connection. dataReceived might be called again if data was received |