Prevent bundling aggregations for state events (#9619)

There's no need to do aggregation bundling for state events. Doing so can cause performance issues.
matrix-org · Mar 16, 2021 · 1b0eaed · 1b0eaed
1 parent 1c8a254
commit 1b0eaed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/changelog.d/9619.misc b/changelog.d/9619.misc
@@ -0,0 +1 @@
+Prevent attempting to bundle aggregations for state events in /context APIs.
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py
@@ -685,7 +685,10 @@ async def on_GET(
             results["events_after"], time_now
         )
         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
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
@@ -671,7 +671,10 @@ async def on_GET(self, request, room_id, event_id):
             results["events_after"], time_now
         )
         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