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

Fix using MSC2716 batch sending with event persistence workers #11220

Merged
merged 5 commits into from Nov 29, 2021
Merged

Fix using MSC2716 batch sending with event persistence workers #11220

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0c73d8
Fix using MSC2716 batch sending with event persistence workers
tulir Oct 30, 2021
deaf3d8
Fix creating batch sent member events on worker
tulir Nov 2, 2021
4153c7b
Preserve outlier metadata when serializing EventContext
tulir Nov 10, 2021
5428846
Merge remote-tracking branch 'upstream/develop' into fix-worker-batch…
tulir Nov 28, 2021
c0a0add
Set empty dicts in _fill_out_state instead of having separate outlier…
tulir Nov 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11220.bugfix
View file
Open in desktop
@@ -0,0 +1 @@
Fix using MSC2716 batch sending in combination with event persistence workers. Contributed by @tulir at Beeper.
2 changes: 2 additions & 0 deletions synapse/app/generic_worker.py
View file
Open in desktop
Expand Up @@ -112,6 +112,7 @@
)
from synapse.storage.databases.main.presence import PresenceStore
from synapse.storage.databases.main.room import RoomWorkerStore
from synapse.storage.databases.main.room_batch import RoomBatchStore
from synapse.storage.databases.main.search import SearchStore
from synapse.storage.databases.main.session import SessionStore
from synapse.storage.databases.main.stats import StatsStore
Expand Down Expand Up @@ -237,6 +238,7 @@ class GenericWorkerSlavedStore(
SlavedEventStore,
SlavedKeyStore,
RoomWorkerStore,
RoomBatchStore,
Copy link
Contributor

Choose a reason for hiding this comment

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

@tulir Might be good to split out this missing import fix for worker mode in a separate PR so we can merge it while we figure out the other problem.

DirectoryStore,
SlavedApplicationServiceStore,
SlavedRegistrationStore,
Expand Down
28 changes: 15 additions & 13 deletions synapse/handlers/message.py
View file
Open in desktop
Expand Up @@ -1382,13 +1382,14 @@ async def persist_and_notify_client_event(

if event.type == EventTypes.Member:
if event.content["membership"] == Membership.INVITE:
event.unsigned[
"invite_room_state"
] = await self.store.get_stripped_room_state_from_event_context(
context,
self.room_prejoin_state_types,
membership_user_id=event.sender,
)
if not event.internal_metadata.outlier:
richvdh marked this conversation as resolved.
Show resolved Hide resolved
event.unsigned[
"invite_room_state"
] = await self.store.get_stripped_room_state_from_event_context(
context,
self.room_prejoin_state_types,
membership_user_id=event.sender,
)

invitee = UserID.from_string(event.state_key)
if not self.hs.is_mine(invitee):
Expand All @@ -1405,12 +1406,13 @@ async def persist_and_notify_client_event(
event.signatures.update(returned_invite.signatures)

if event.content["membership"] == Membership.KNOCK:
event.unsigned[
"knock_room_state"
] = await self.store.get_stripped_room_state_from_event_context(
context,
self.room_prejoin_state_types,
)
if not event.internal_metadata.outlier:
event.unsigned[
"knock_room_state"
] = await self.store.get_stripped_room_state_from_event_context(
context,
self.room_prejoin_state_types,
)
richvdh marked this conversation as resolved.
Show resolved Hide resolved

if event.type == EventTypes.Redaction:
original_event = await self.store.get_event(
Expand Down