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

Don't keep old stream_ordering_to_exterm around #15382

Merged
merged 7 commits into from Apr 6, 2023
Merged

Don't keep old stream_ordering_to_exterm around #15382

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe0f38e
Don't keep old stream_ordering_to_exterm around
erikjohnston Apr 3, 2023
81a27da
Newsfile
erikjohnston Apr 3, 2023
6665a7f
Handle edge case
erikjohnston Apr 3, 2023
d5ccd2d
Check if extremities have changed
erikjohnston Apr 5, 2023
c9ee761
Rename func
erikjohnston Apr 6, 2023
4b3c536
Merge branch 'develop' into erikj/better_old_stream_orderings
erikjohnston Apr 6, 2023
527812c
Merge branch 'develop' into erikj/better_old_stream_orderings
erikjohnston Apr 6, 2023
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
11 changes: 2 additions & 9 deletions synapse/storage/databases/main/event_federation.py
View file
Open in desktop
Expand Up @@ -1664,19 +1664,12 @@ async def get_successor_events(self, event_id: str) -> List[str]:
@wrap_as_background_process("delete_old_forward_extrem_cache")
async def _delete_old_forward_extrem_cache(self) -> None:
def _delete_old_forward_extrem_cache_txn(txn: LoggingTransaction) -> None:
# Delete entries older than a month, while making sure we don't delete
# the only entries for a room.
Comment on lines -1667 to -1668
Copy link
Contributor

Choose a reason for hiding this comment

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

Chesterton's Fence: do we know why this was here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I've been trying to figure this out, but couldn't see any reason for it until last night.

I think it may have been to protect against the case of a room that hasn't been updated in the last month, where you want to return the most recent extremities, so that the caller then becomes a no-op.

Let me think how best to keep that optimisation.

sql = """
DELETE FROM stream_ordering_to_exterm
WHERE
room_id IN (
SELECT room_id
FROM stream_ordering_to_exterm
WHERE stream_ordering > ?
) AND stream_ordering < ?
WHERE stream_ordering < ?
"""
txn.execute(
sql, (self.stream_ordering_month_ago, self.stream_ordering_month_ago) # type: ignore[attr-defined]
sql, (self.stream_ordering_month_ago) # type: ignore[attr-defined]
)

await self.db_pool.runInteraction(
Expand Down