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

Commit

Permalink
Do not wait for background updates to complete do expire URL cache. (#…
Browse files Browse the repository at this point in the history
…13657)

Media downloaded as part of a URL preview is normally deleted after two days.
However, while a background database migration is running, the process is
stopped. A long-running database migration can therefore cause the media
store to fill up with old preview files.

This logic was added in #2697 to make sure that we didn't try to run the expiry
without an index on `local_media_repository.created_ts`; the original logic that
needs that index was added in #2478 (in `get_url_cache_media_before`, as
amended by 93247a4), and is still present.

Given that the background update was added before Synapse v1.0.0, just drop
this check and assume the index exists.
  • Loading branch information
clokep authored Aug 30, 2022
1 parent 20df96a commit 303b40b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
1 change: 1 addition & 0 deletions changelog.d/13657.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a long-standing bug that downloaded media for URL previews was not deleted while database background updates were running.
4 changes: 0 additions & 4 deletions synapse/rest/media/v1/preview_url_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,6 @@ async def _expire_url_cache_data(self) -> None:

logger.debug("Running url preview cache expiry")

if not (await self.store.db_pool.updates.has_completed_background_updates()):
logger.debug("Still running DB updates; skipping url preview cache expiry")
return

def try_remove_parent_dirs(dirs: Iterable[str]) -> None:
"""Attempt to remove the given chain of parent directories
Expand Down

0 comments on commit 303b40b

Please sign in to comment.