Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent bundling aggregations for state events (#9619) 

There's no need to do aggregation bundling for state events. Doing so can cause performance issues.
This commit is contained in:
Andrew Morgan 2021-03-16 10:27:51 +00:00 committed by GitHub
parent 1c8a2541da
commit 1b0eaed21f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9619.misc Normal file
View File

@ -0,0 +1 @@
Prevent attempting to bundle aggregations for state events in /context APIs.

5
synapse/rest/admin/rooms.py
View File

@ -685,7 +685,10 @@ class RoomEventContextServlet(RestServlet):
results["events_after"], time_now results["events_after"], time_now
) )
results["state"] = await self._event_serializer.serialize_events( results["state"] = await self._event_serializer.serialize_events(
results["state"], time_now results["state"],
time_now,
# No need to bundle aggregations for state events
bundle_aggregations=False,
) )
return 200, results return 200, results

5
synapse/rest/client/v1/room.py
View File

@ -671,7 +671,10 @@ class RoomEventContextServlet(RestServlet):
results["events_after"], time_now results["events_after"], time_now
) )
results["state"] = await self._event_serializer.serialize_events( results["state"] = await self._event_serializer.serialize_events(
results["state"], time_now results["state"],
time_now,
# No need to bundle aggregations for state events
bundle_aggregations=False,
) )
return 200, results return 200, results