From 4d1a18537e998d7ea8ecc058fbf50cd841d2fbe4 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 1 Dec 2022 12:58:57 +0000 Subject: [PATCH] Also prune removes and undos --- .../docs/administration/CLI_tasks/database.md | 20 +++++++++++++++++++ lib/pleroma/activity/pruner.ex | 18 +++++++++++++++++ .../workers/cron/database_prune_worker.ex | 6 ++++++ 3 files changed, 44 insertions(+) diff --git a/docs/docs/administration/CLI_tasks/database.md b/docs/docs/administration/CLI_tasks/database.md index 8b2ab93e6..73419dc81 100644 --- a/docs/docs/administration/CLI_tasks/database.md +++ b/docs/docs/administration/CLI_tasks/database.md @@ -159,3 +159,23 @@ Change `default_text_search_config` for database and (if necessary) text_search_ ``` See [PostgreSQL documentation](https://www.postgresql.org/docs/current/textsearch-configuration.html) and `docs/configuration/howto_search_cjk.md` for more detail. + +## Pruning old activities + +Over time, transient `Delete` activities and `Tombstone` objects +can accumulate in your database, inflating its size. This is not ideal. +There is a periodic task to prune these transient objects, +but on first run this may take a while on older instances to catch up +to the current day. + +=== "OTP" + + ```sh + ./bin/pleroma_ctl database prune_task + ``` + +=== "From Source" + + ```sh + mix pleroma.database prune_task + ``` \ No newline at end of file diff --git a/lib/pleroma/activity/pruner.ex b/lib/pleroma/activity/pruner.ex index d712ea954..054ee514a 100644 --- a/lib/pleroma/activity/pruner.ex +++ b/lib/pleroma/activity/pruner.ex @@ -17,6 +17,24 @@ defmodule Pleroma.Activity.Pruner do |> Repo.delete_all(timeout: :infinity) end + def prune_undos do + before_time = cutoff() + + from(a in Activity, + where: fragment("?->>'type' = ?", a.data, "Undo") and a.inserted_at < ^before_time + ) + |> Repo.delete_all(timeout: :infinity) + end + + def prune_removes do + before_time = cutoff() + + from(a in Activity, + where: fragment("?->>'type' = ?", a.data, "Remove") and a.inserted_at < ^before_time + ) + |> Repo.delete_all(timeout: :infinity) + end + defp cutoff do DateTime.utc_now() |> Timex.shift(days: -@cutoff) end diff --git a/lib/pleroma/workers/cron/database_prune_worker.ex b/lib/pleroma/workers/cron/database_prune_worker.ex index e73fc25e3..99ea2e836 100644 --- a/lib/pleroma/workers/cron/database_prune_worker.ex +++ b/lib/pleroma/workers/cron/database_prune_worker.ex @@ -15,6 +15,12 @@ defmodule Pleroma.Workers.Cron.PruneDatabaseWorker do Logger.info("Pruning old deletes") ActivityPruner.prune_deletes() + Logger.info("Pruning old undos") + ActivityPruner.prune_undos() + + Logger.info("Pruning old removes") + ActivityPruner.prune_removes() + Logger.info("Pruning old tombstone delivery entries") ObjectPruner.prune_tombstoned_deliveries()