Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reintroduce #17291. #17338

Merged
merged 5 commits into from
Jun 24, 2024
Merged

Reintroduce #17291. #17338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3aa2d97
Handle large chain calc better (#17291)
erikjohnston Jun 19, 2024
03b674e
Fixups
erikjohnston Jun 20, 2024
5e403a2
Newsfile
erikjohnston Jun 20, 2024
f774495
Fix test
erikjohnston Jun 20, 2024
3bfb033
Update changelog.d/17338.misc
erikjohnston Jun 24, 2024
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
Next Next commit
Handle large chain calc better (#17291) 
We calculate the auth chain links outside of the main persist event
transaction to ensure that we do not block other event sending during
the calculation.
  • Loading branch information
@erikjohnston
erikjohnston committed Jun 20, 2024
commit 3aa2d97590344e6fecb3ca22c229e795b85bf745
1 change: 1 addition & 0 deletions changelog.d/17291.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not block event sending/receiving while calulating large event auth chains.
12 changes: 12 additions & 0 deletions synapse/storage/controllers/persist_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,13 +617,25 @@ async def _persist_event_batch(
room_id, chunk
)

with Measure(self._clock, "calculate_chain_cover_index_for_events"):
# We now calculate chain ID/sequence numbers for any state events we're
# persisting. We ignore out of band memberships as we're not in the room
# and won't have their auth chain (we'll fix it up later if we join the
# room).
#
# See: docs/auth_chain_difference_algorithm.md
new_event_links = await self.persist_events_store.calculate_chain_cover_index_for_events(
room_id, [e for e, _ in chunk]
)

await self.persist_events_store._persist_events_and_state_updates(
room_id,
chunk,
state_delta_for_room=state_delta_for_room,
new_forward_extremities=new_forward_extremities,
use_negative_stream_ordering=backfilled,
inhibit_local_membership_updates=backfilled,
new_event_links=new_event_links,
)

return replaced_events
Expand Down
Loading