diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-12-15 13:13:08 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-12-15 13:13:08 +0000 |
| commit | 59544678a1b4f087d0cb445fd6548f8e830fbb6c (patch) | |
| tree | 182b2dc6a6f9e216d1b1bb00f1f2e8ca5c171c1b /synapse | |
| parent | Merge branch 'release-v1.49' into matrix-org-hotfixes (diff) | |
| parent | Disable aggregation bundling on `/sync` responses (diff) | |
| download | synapse-59544678a1b4f087d0cb445fd6548f8e830fbb6c.tar.xz | |
Merge branch 'rav/no_bundle_aggregations_in_sync' into matrix-org-hotfixes
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/client/sync.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/rest/client/sync.py b/synapse/rest/client/sync.py index 88e4f5e063..e556ff93e6 100644 --- a/synapse/rest/client/sync.py +++ b/synapse/rest/client/sync.py @@ -522,7 +522,13 @@ class SyncRestServlet(RestServlet): time_now=time_now, # Don't bother to bundle aggregations if the timeline is unlimited, # as clients will have all the necessary information. - bundle_aggregations=room.timeline.limited, + # bundle_aggregations=room.timeline.limited, + # + # richvdh 2021-12-15: disable this temporarily as it has too high an + # overhead for initialsyncs. We need to figure out a way that the + # bundling can be done *before* the events are stored in the + # SyncResponseCache so that this part can be synchronous. + bundle_aggregations=False, token_id=token_id, event_format=event_formatter, only_event_fields=only_fields, |