From dac14a36e560a20f4634b3efa3e46c8e03acfc40 Mon Sep 17 00:00:00 2001 From: Petitminion Date: Fri, 9 Jun 2023 12:27:02 +0200 Subject: [PATCH] fix: Avoid high memory usage when pruning a lot of skipped uploads Part-of: --- .../music/management/commands/prune_skipped_uploads.py | 2 +- changes/changelog.d/2136.bugfix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/changelog.d/2136.bugfix diff --git a/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py b/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py index e707c484b..604cba36c 100644 --- a/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py +++ b/api/funkwhale_api/music/management/commands/prune_skipped_uploads.py @@ -22,7 +22,7 @@ class Command(BaseCommand): @transaction.atomic def handle(self, *args, **options): skipped = models.Upload.objects.filter(import_status="skipped") - count = len(skipped) + count = skipped.count() if options["force"]: skipped.delete() print(f"Deleted {count} entries from the database.") diff --git a/changes/changelog.d/2136.bugfix b/changes/changelog.d/2136.bugfix new file mode 100644 index 000000000..e87fc04cc --- /dev/null +++ b/changes/changelog.d/2136.bugfix @@ -0,0 +1 @@ +Fix Prune skipped uploads is OOM killed (#2136)