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

Allow censoring of events to happen on workers. #7492

Merged
merged 3 commits into from
May 13, 2020
Merged

Allow censoring of events to happen on workers. #7492

merged 3 commits into from
May 13, 2020

Conversation

erikjohnston
Copy link
Member

This is safe as we can now write to cache invalidation stream on workers, and is required for when we move event persistence off master.

@erikjohnston
Allow events to be censored from workers.
58f866a 
This is safe as we can now write to cache invalidation stream on
workers.
@erikjohnston
Newsfile
203ac8b
@erikjohnston erikjohnston requested a review from a team May 13, 2020 15:07
anoadragon453
anoadragon453 approved these changes May 13, 2020
View reviewed changes
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

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

lgtm otherwise

synapse/handlers/message.py
@@ -260,7 +260,6 @@ def maybe_schedule_expiry(self, event):
Args:
event (EventBase): The event to schedule the expiry of.
"""
assert not self._is_worker_app
Copy link
Member

Choose a reason for hiding this comment

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

Looks like self._is_worker_app is no longer used now.

Copy link
Member Author

Choose a reason for hiding this comment

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

good shout

@erikjohnston erikjohnston merged commit 1124111 into develop May 13, 2020
@erikjohnston erikjohnston deleted the erikj/shuffle_stores_3 branch May 13, 2020 16:15
phil-flex pushed a commit to phil-flex/synapse that referenced this pull request Jun 16, 2020
@erikjohnston @phil-flex
Allow censoring of events to happen on workers. (matrix-org#7492)
39a46b6 
This is safe as we can now write to cache invalidation stream on workers, and is required for when we move event persistence off master.
richvdh added a commit that referenced this pull request Oct 1, 2020
@richvdh
Remove redundant EventCreationHandler._is_worker_app attribute
e675bbc 
This was added in 1c347c8/#7544 as a temporary optimisation. That was never
merged to develop, since it conflicted with #7492. The merge cf92310 forgot
to remove it.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anoadragon453 anoadragon453 anoadragon453 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@erikjohnston @anoadragon453