[pbs-devel] [RFC v2 proxmox-backup 00/21] implement trash bin functionality

Christian Ebner c.ebner at proxmox.com
Thu May 8 15:05:34 CEST 2025


This patch series implements a trash bin functionality, marking
backup snapshots, groups and namespaces 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.

In contrast to the previous version 1 of the patch series [0] which
moved trashed items to a separate folder structure, this patch series
utilizes the proposed `.trashed` marker file approach to mark and
filter content items. These marker files have to be set and removed
accordingly in a consistent manner and are used to filter in
iterators based on the trash state.

Sending this series as RFC in order to gain some initial feedback on
the chosen implementation approach and possible
shortcomings/oversights. Further, feedback especially for the design
of the WebUI (which still has some rough edges) is very welcome!

[0] https://lore.proxmox.com/pbs-devel/7db77767-ed54-4d7f-8caa-24b7216b159c@proxmox.com/T/

Christian Ebner (21):
  datastore/api: mark snapshots as trash on destroy
  datastore: mark groups as trash on destroy
  datastore: allow filtering of backups by their trash status
  datastore: ignore trashed snapshots for last successful backup
  sync: ignore trashed snapshots when reading from local source
  api: tape: check trash marker when trying to write snapshot
  sync: ignore trashed groups in local source reader
  datastore: namespace: add filter for trash status
  datastore: refactor recursive namespace removal
  datastore: mark namespace as trash instead of deleting it
  datastore: check for trash marker in namespace exists check
  datastore: clear trashed snapshot dir if re-creation requested
  datastore: recreate trashed backup groups if requested
  datastore: GC: clean-up trashed snapshots, groups and namespaces
  client: expose skip trash flags for cli commands
  api: datastore: add flag to list trashed snapshots only
  api: namespace: add option to list all namespaces, including trashed
  api: admin: implement endpoints to restore trashed contents
  ui: add recover for trashed items tab to datastore panel
  ui: drop 'permanent' in group/snapshot forget, default is to trash
  ui: allow to skip trash on namespace deletion

 pbs-datastore/examples/ls-snapshots.rs  |   8 +-
 pbs-datastore/src/backup_info.rs        | 130 +++-
 pbs-datastore/src/datastore.rs          | 320 ++++++++-
 pbs-datastore/src/hierarchy.rs          |  91 ++-
 pbs-datastore/src/lib.rs                |   1 +
 proxmox-backup-client/src/group.rs      |  14 +-
 proxmox-backup-client/src/namespace.rs  |  14 +-
 proxmox-backup-client/src/snapshot.rs   |  16 +-
 src/api2/admin/datastore.rs             | 225 +++++-
 src/api2/admin/namespace.rs             |  28 +-
 src/api2/backup/environment.rs          |   1 +
 src/api2/tape/backup.rs                 |  20 +-
 src/backup/hierarchy.rs                 |  26 +-
 src/backup/verify.rs                    |   4 +-
 src/bin/proxmox-backup-manager.rs       |  12 +-
 src/bin/proxmox_backup_manager/prune.rs |   2 +-
 src/server/prune_job.rs                 |   7 +-
 src/server/pull.rs                      |  25 +-
 src/server/sync.rs                      |   7 +-
 www/Makefile                            |   1 +
 www/datastore/Content.js                |   4 +-
 www/datastore/Panel.js                  |   8 +
 www/datastore/RecoverTrashed.js         | 876 ++++++++++++++++++++++++
 www/window/NamespaceEdit.js             |  21 +-
 24 files changed, 1737 insertions(+), 124 deletions(-)
 create mode 100644 www/datastore/RecoverTrashed.js

-- 
2.39.5





More information about the pbs-devel mailing list