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

Ensure we mark sent knocks as outliers #10873

Merged
merged 2 commits into from
Sep 22, 2021
Merged

Ensure we mark sent knocks as outliers #10873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a49d98
Ensure we mark sent knocks as outliers
richvdh Sep 22, 2021
0887494
set the out_of_band_membership flag too
richvdh Sep 22, 2021
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/10873.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a bug introduced in Synapse 1.37.0 which caused `knock` events which we sent to remote servers to be incorrectly stored in the local database.
7 changes: 7 additions & 0 deletions synapse/handlers/federation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,13 @@ async def do_knock(
target_hosts, room_id, knockee, Membership.KNOCK, content, params=params
)

# Mark the knock as an outlier as we don't yet have the state at this point in
# the DAG.
event.internal_metadata.outlier = True

# ... but tell /sync to send it to clients anyway.
event.internal_metadata.out_of_band_membership = True

# Record the room ID and its version so that we have a record of the room
await self._maybe_store_room_on_outlier_membership(
room_id=event.room_id, room_version=event_format_version
Expand Down