This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Avoid brand new rooms in delete_old_current_state_events#7854
Merged
Avoid brand new rooms in delete_old_current_state_events#7854
delete_old_current_state_events#7854Conversation
When considering rooms to clean up in `delete_old_current_state_events`, skip rooms which we are creating, which otherwise look a bit like rooms we have left. Fixes #7834.
richvdh
commented
Jul 15, 2020
Comment on lines
+367
to
+377
| # exclude rooms where we have active members | ||
| sql = """ | ||
| SELECT room_id | ||
| FROM current_state_events | ||
| FROM local_current_membership | ||
| WHERE | ||
| room_id > ? AND room_id <= ? | ||
| AND type = 'm.room.member' | ||
| AND membership = 'join' | ||
| AND state_key LIKE ? | ||
| GROUP BY room_id | ||
| """ | ||
|
|
||
| txn.execute(sql, (last_room_id, room_ids[-1], "%:" + self.server_name)) | ||
|
|
||
| txn.execute(sql, (last_room_id, room_ids[-1])) |
Member
Author
There was a problem hiding this comment.
these changes are unrelated, but I thought I may as well simplify it while I was here.
erikjohnston
approved these changes
Jul 15, 2020
clokep
reviewed
Jul 15, 2020
Comment on lines
+401
to
+406
| creating_rooms = to_delete.difference(row[0] for row in txn) | ||
| logger.info("skipping rooms which are being deleted: %s", creating_rooms) | ||
|
|
||
| left_rooms = set(room_ids) - joined_room_ids | ||
| to_delete.difference_update(creating_rooms) | ||
|
|
||
| logger.info("Deleting current state left rooms: %r", left_rooms) | ||
| logger.info("Deleting current state left rooms: %r", to_delete) |
Member
There was a problem hiding this comment.
Just to walk through the logic here:
- The returned rooms are ones that have forward extremities that are not the create event (i.e. they are rooms that are not being created currently).
to_deleteis modified to remove the above, meaning we're left with the rooms that are being created (saved ascreating_rooms).to_deleteis modified to removecreating_rooms, leaving only the rooms which are not being currently created. (I think this is equivalent to the intersection of the result of step 1 andto_deleteat the time of step 1, but that doesn't give you something nice to log, unfortunately.)
Not sure if it matters much, but I find the set operations easier to read using operators, e.g. to_delete -= creating_rooms (although this only works if they're both sets, I think).
Member
Author
There was a problem hiding this comment.
yes, your logic is correct.
I'll add some comments to clarify.
Not sure if it matters much, but I find the set operations easier to read using operators, e.g. to_delete -= creating_rooms (although this only works if they're both sets, I think).
agreed, and the fact that some of these aren't sets is the reason I had to use the wordy version.
Member
There was a problem hiding this comment.
The added comments look great! 👍
Co-authored-by: Erik Johnston <erik@matrix.org>
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit 'a973bcb8a': Add some tiny type annotations (#7870) Remove obsolete comment. Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836) Avoid brand new rooms in `delete_old_current_state_events` (#7854) Allow accounts to be re-activated from the admin APIs. (#7847) Fix tests Fix typo Newsfile Use get_users_in_room rather than state handler in typing for speed Fix client reader sharding tests (#7853) Convert E2E key and room key handlers to async/await. (#7851) Return the proper 403 Forbidden error during errors with JWT logins. (#7844) remove `retry_on_integrity_error` wrapper for persist_events (#7848)
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
When considering rooms to clean up in
delete_old_current_state_events, skip rooms which we are creating, which otherwise look a bit like rooms we have left.Fixes #7834.