diff options
| author | Erik Johnston <erik@matrix.org> | 2022-07-15 12:06:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-15 11:06:41 +0000 |
| commit | 7be954f59b4a8c98752e72c628c853d448b746ad (patch) | |
| tree | 5e662c66a4b0f9f36b985402ae7f48f71d2f9a7a /synapse/storage | |
| parent | Docker: copy postgres from base image (#13279) (diff) | |
| download | synapse-7be954f59b4a8c98752e72c628c853d448b746ad.tar.xz | |
Fix a bug which could lead to incorrect state (#13278)
There are two fixes here: 1. A long-standing bug where we incorrectly calculated `delta_ids`; and 2. A bug introduced in #13267 where we got current state incorrect.
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/controllers/persist_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/controllers/persist_events.py b/synapse/storage/controllers/persist_events.py index af65e5913b..cf98b0ab48 100644 --- a/synapse/storage/controllers/persist_events.py +++ b/synapse/storage/controllers/persist_events.py @@ -948,7 +948,8 @@ class EventsPersistenceStorageController: events_context, ) - return res.state, None, new_latest_event_ids + full_state = await res.get_state(self._state_controller) + return full_state, None, new_latest_event_ids async def _prune_extremities( self, |