[pbs-devel] [PATCH v3 proxmox proxmox-backup 00/20] implement trash bin functionality

Christian Ebner c.ebner at proxmox.com
Tue May 13 15:52:27 CEST 2025


This patch series implements a trash bin functionality, marking
backup snapshots and groups as trashed on prune and forget instead of
deleting them immediately. Cleanup is deferred to the garbage
collection job, allowing to recover the trashed items if removed by
accident.

Items are marked as trash by creating a `.trashed` marker file within
the respective snapshot or group directory. If group directories
contain the marker file, the whole group is considered trash. New
backups to a trashed group will remove the group trash marker file,
but only if the group is owned by the user creating the backup.
Backup creation will fail otherwise, in order to guarantee ownership.
If an backup is created to a pre-existing but trashed backup
directory, the backup directories contents are cleared and the backup
can proceed as if no such snapshot existed.

Most notably changes since the previous RFC version [0] (thanks Fabian
for feedback and discussion):
- Do not allow to mark namespaces as trash. Instead, in order to
  remove a namespace all contents (including trashed items) must be
  deleted. Drop all related patches as there is no longer the need to
  operate and filter on namespaces directly.
- Use exclusive snapshot/group locks in order to guarantee
  consistency during concurrent operations.
- Only clear backup snapshot directories in case of a new backup to the
  same backup directory. For groups, only allow to create a new backup
  to a trashed group if the ownership matches, but do not clear
  pre-existing trashed contents.
- Use pre-existing helpers for snapshot/group cleanup during garbage
  collection.
- Allow to clear only the trashed contents for a namespace or group via
  the API/WebUI, not removing all contents.
- Allow to filter for all trash states while listing snapshots,
  introducing a dedicated api type for this.
- Fix several smaller UI issues

As most of the patches changed significantly and many got dropped while
new ones added, no per-patch changes are noted.

Note: Patches 5 and onwards require patches 1 and 2 to the PBS api types
for compilation.

[0] https://lore.proxmox.com/pbs-devel/20250508130555.494782-1-c.ebner@proxmox.com/T/

proxmox:

Christian Ebner (2):
  pbs api types: add type for snapshot list filtering based on trash
    state
  pbs api types: datastore: add trash marker to snapshot list item

 pbs-api-types/src/datastore.rs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

proxmox-backup:

Christian Ebner (18):
  datastore/api: mark snapshots as trash on destroy
  datastore: mark groups as trash on destroy
  datastore: add helpers to check if snapshot/group is trash
  datastore: allow filtering of backups by their trash state
  api: datastore: add trash state filtering for snapshot listing
  datastore: ignore trashed snapshots for last successful backup
  sync: ignore trashed snapshots/groups when reading from local source
  api: tape: check trash marker when trying to write snapshot
  datastore: clear trashed snapshot dir if re-creation requested
  datastore: recover backup group from trash for new backups
  datastore: garbage collection: clean-up trashed snapshots and groups
  client: expose skip trash flags for cli commands
  api: admin: implement endpoints to recover trashed contents
  api: admin: move backup group list generation into helper
  api: admin: add endpoint to clear trashed items from group
  ui: add recover for trashed items tab to datastore panel
  ui: drop 'permanent' in group/snapshot forget, default is to trash
  ui: mention trash items will be cleared on namespace deletion

 pbs-datastore/src/backup_info.rs      | 152 +++--
 pbs-datastore/src/datastore.rs        |  90 ++-
 proxmox-backup-client/src/group.rs    |  14 +-
 proxmox-backup-client/src/snapshot.rs |  16 +-
 src/api2/admin/datastore.rs           | 319 ++++++++--
 src/api2/backup/environment.rs        |   1 +
 src/api2/tape/backup.rs               |  12 +-
 src/backup/verify.rs                  |   6 +-
 src/server/prune_job.rs               |  10 +-
 src/server/pull.rs                    |  20 +-
 src/server/sync.rs                    |   2 +
 tests/prune.rs                        |   1 +
 www/Makefile                          |   1 +
 www/Utils.js                          |   1 +
 www/datastore/Content.js              |   4 +-
 www/datastore/Panel.js                |   8 +
 www/datastore/RecoverTrashed.js       | 805 ++++++++++++++++++++++++++
 www/window/NamespaceEdit.js           |   2 +-
 18 files changed, 1359 insertions(+), 105 deletions(-)
 create mode 100644 www/datastore/RecoverTrashed.js

-- 
2.39.5





More information about the pbs-devel mailing list