Make room upgrades faster for rooms with many bans #18574
+156
−26
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
synapse/handlers/room.py
Outdated
Comment on lines
612
to
628
| # Add any banned users to the new room | ||
| await self.event_creation_handler.create_and_send_new_client_events( | ||
| requester=requester, | ||
| room_id=new_room_id, | ||
| prev_event_id=last_event_id, | ||
| event_dicts=[ | ||
| { | ||
| "type": EventTypes.Member, | ||
| "state_key": ban_event.state_key, | ||
| "room_id": new_room_id, | ||
| "sender": requester.user.to_string(), | ||
| "content": ban_event.content, | ||
| } | ||
| for ban_event in ban_events | ||
| ], | ||
| ratelimit=False, | ||
| ) |
There was a problem hiding this comment.
Instead of adding our own new create_and_send_new_client_events(...) method, can we just add all of the bans to _send_events_for_new_room(...) initial_state?
It looks like it also makes its way to handle_new_client_event with bulk events like what create_and_send_new_client_events does.
Co-authored-by: Eric Eastwood <[email protected]>
Comment on lines
+1526
to
+1528
| This supports sending membership events in very limited circumstances | ||
| (namely that the event is valid as is and doesn't need federation | ||
| requests or anything). Callers should prefer to use `update_membership`, |
There was a problem hiding this comment.
Feels like we should better clarify that general state events are just fine.
synapse/handlers/room.py
Outdated
| "sender": requester.user.to_string(), | ||
| "content": ban_event.content, | ||
| } | ||
| for ban_event in ban_events |
There was a problem hiding this comment.
Is there a maximum number of events we should be calling with at a time?
We could use batch_iter
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We do this by a) not pulling out all membership events, and b) batch inserting bans.
One blocking concern is that this bypasses the
update_membershipfunction, which otherwise all other membership events go via. In this case it's fine (having audited what it is doing), but I'm hesitant to set the precedent of bypassing it, given it has a lot of logic in there.