Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
8f2a5276
Unverified
Commit
8f2a5276
authored
3 years ago
by
Richard van der Hoff
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Ensure we mark sent knocks as outliers (#10873)
parent
6fc8be9a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/10873.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/10873.bugfix
synapse/handlers/federation.py
+7
-0
7 additions, 0 deletions
synapse/handlers/federation.py
with
8 additions
and
0 deletions
changelog.d/10873.bugfix
0 → 100644
+
1
−
0
View file @
8f2a5276
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.
This diff is collapsed.
Click to expand it.
synapse/handlers/federation.py
+
7
−
0
View file @
8f2a5276
...
@@ -593,6 +593,13 @@ class FederationHandler(BaseHandler):
...
@@ -593,6 +593,13 @@ class FederationHandler(BaseHandler):
target_hosts
,
room_id
,
knockee
,
Membership
.
KNOCK
,
content
,
params
=
params
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
# Record the room ID and its version so that we have a record of the room
await
self
.
_maybe_store_room_on_outlier_membership
(
await
self
.
_maybe_store_room_on_outlier_membership
(
room_id
=
event
.
room_id
,
room_version
=
event_format_version
room_id
=
event
.
room_id
,
room_version
=
event_format_version
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment