Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix a bug which could lead to incorrect state #13278

Merged
merged 11 commits into from
Jul 15, 2022
Merged

Fix a bug which could lead to incorrect state #13278

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f98c691
Fix bug where the state deltas were incorrect
erikjohnston Jul 14, 2022
efd5c32
Fix bug where we didn't calculate the state correctly for new events
erikjohnston Jul 14, 2022
b92429f
Add test
erikjohnston Jul 14, 2022
eb6e0aa
Newsfile
erikjohnston Jul 14, 2022
e5e15d8
Rename StateCacheEntry.state to reduce confusion
erikjohnston Jul 14, 2022
deba7e9
Apply suggestions from code review
erikjohnston Jul 15, 2022
3c5f81e
Rewrap
erikjohnston Jul 15, 2022
7a3c1f0
Move full state
erikjohnston Jul 15, 2022
0c9ad7c
Mention when it can be None
erikjohnston Jul 15, 2022
30d7200
Better test for delta IDs
erikjohnston Jul 15, 2022
1abff21
Update tests/test_state.py
erikjohnston Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion synapse/storage/controllers/persist_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,6 +934,8 @@ async def _get_new_state_after_events(
state_res_store=StateResolutionStore(self.main_store),
)

full_state = await res.get_state(self._state_controller)
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved

state_resolutions_during_persistence.inc()

# If the returned state matches the state group of one of the new
Expand All @@ -948,7 +950,7 @@ async def _get_new_state_after_events(
events_context,
)

return res.state, None, new_latest_event_ids
return full_state, None, new_latest_event_ids
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooops. Sorry.


async def _prune_extremities(
self,
Expand Down