summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-03-15 11:59:54 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2021-03-15 12:08:53 +0000
commit0dfb86bf5e31e2fd23b1adf6f01743e0c39b2d09 (patch)
tree20be41cd73118f8fa23286124c6cf2a37a6de55b
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
downloadsynapse-github/anoa/bundle_aggregations_state.tar.xz
Prevent bundling aggregations for state events github/anoa/bundle_aggregations_state anoa/bundle_aggregations_state
We're trying this out on hotfixes to see whether it helps address
performance issues. There's no need to do aggregation bundling for
state events anyways.
-rw-r--r--synapse/rest/admin/rooms.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/admin/rooms.py b/synapse/rest/admin/rooms.py
index f2c42a0f30..263d8ec076 100644
--- a/synapse/rest/admin/rooms.py
+++ b/synapse/rest/admin/rooms.py
@@ -685,7 +685,10 @@ class RoomEventContextServlet(RestServlet):
             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