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

Faster joins: Update room stats and the user directory on workers when finishing join #14874

Merged
merged 3 commits into from
Jan 23, 2023
Merged

Faster joins: Update room stats and the user directory on workers when finishing join #14874

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e921504
Faster joins: Update room stats and user directory on workers when done
Jan 19, 2023
1cbb28d
fixup comment
Jan 20, 2023
aa847ea
Merge branch 'develop' into squah/notify_replication_on_update_curren…
Jan 22, 2023
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
1 change: 1 addition & 0 deletions changelog.d/14874.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Faster joins: Fix a bug in worker deployments where the room stats and user directory would not get updated when finishing a fast join until another event is sent or received.
4 changes: 0 additions & 4 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,10 +1735,6 @@ async def _sync_partial_state_room(
# Poke the notifier so that other workers see the write to
# the un-partial-stated rooms stream.
self._notifier.notify_replication()

# TODO(faster_joins) update room stats and user directory?
# https://github.com/matrix-org/synapse/issues/12814
# https://github.com/matrix-org/synapse/issues/12815
return

# we raced against more events arriving with partial state. Go round
Expand Down
5 changes: 5 additions & 0 deletions synapse/replication/tcp/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ async def on_rdata(
# we don't need to optimise this for multiple rows.
for row in rows:
if row.type != EventsStreamEventRow.TypeId:
# The row's data is an `EventsStreamCurrentStateRow`.
# When finishing up a partial state join, the current state of a
# room will change without any new events being persisted, so we
# must poke the replication callbacks ourselves.
self.notifier.notify_replication()
MatMaul marked this conversation as resolved.
Show resolved Hide resolved
continue
assert isinstance(row, EventsStreamRow)
assert isinstance(row.data, EventsStreamEventRow)
Expand Down
2 changes: 0 additions & 2 deletions synapse/storage/controllers/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,6 @@ async def get_current_state_deltas(
up to date.
"""
# FIXME(faster_joins): what do we do here?
# https://github.com/matrix-org/synapse/issues/12814
# https://github.com/matrix-org/synapse/issues/12815
# https://github.com/matrix-org/synapse/issues/13008

return await self.stores.main.get_partial_current_state_deltas(
Expand Down