[pbs-devel] applied series: [PATCH proxmox-backup v3 00/13] add 'protected' setting for snapshots

Wolfgang Bumiller w.bumiller at proxmox.com
Thu Oct 28 11:33:15 CEST 2021


applied series

The mentioned error handling thing is a non-issue as File::create
doesn't use O_EXCL anyway, and the cleanup can be done as follow-up.

On Wed, Oct 27, 2021 at 01:22:25PM +0200, Dominik Csapak wrote:
> this v3 is mostly to provide a current rebase on master, since some of
> the code was moved
> 
> add the means to 'protect' a snapshot against pruning and removal by
> adding a file '.protected' in the snapshot folder
> 
> in the v2, i opted against syncing the protected flag for two reasons:
> * it gives the admin the choice on each datastore if he wants to keep
>   the snapshot or not(if we sync it, we would have to sync it everytime?)
> * it is much simpler to implement
> 
> changes from v2:
> * rebase on master
> * increase width of action column (so that all icons are visible)
> 
> changes from v1:
> * rebase on master
> * return the PruneMark enum instead of two booleans in compute_prune_info
> * lock the snapshot when setting/removig the flag
> * don't bail if the file does not exist on removal
> * add a 'protected show' command to the client
> * add a docs section to explain the protected flag
> 
> changes from rfc:
> * added gui parts
> * added tests
> * fixed a bug (that the test uncovered)
> * add pbs client command
> * prevent removal (also during sync)
> 
> Dominik Csapak (13):
>   pbs-datastore: add protection info to BackupInfo
>   pbs-datastore: skip protected backups in pruning
>   add protected info of snapshots to api and task logs
>   tests/prune: add tests for protecteded backups
>   backup/datastore: prevent protected snapshots to be removed
>   pull_store/group: dont try remove locally protected snapshots
>   api2: datastore/delete_group: throw error for partially removed group
>   api2/admin/datastore: add get/set_protection
>   proxmox-backup-client: add 'protected' commands
>   ui: PruneInputPanel: add keepReason 'protected' for protected backups
>   ui: add protected icon to snapshots
>   fix #3602: ui: datastore/Content: add action to set protection status
>   docs: add info about protection flag to client docs
> 
>  docs/backup-client.rst                |  19 +++++
>  pbs-api-types/src/datastore.rs        |   2 +
>  pbs-datastore/src/backup_info.rs      |  20 ++++-
>  pbs-datastore/src/datastore.rs        |  61 +++++++++++---
>  pbs-datastore/src/prune.rs            |  44 ++++++++--
>  proxmox-backup-client/src/snapshot.rs | 113 ++++++++++++++++++++++++++
>  src/api2/admin/datastore.rs           | 111 +++++++++++++++++++++++--
>  src/server/prune_job.rs               |   6 +-
>  src/server/pull.rs                    |  20 ++++-
>  tests/prune.rs                        |  44 +++++++++-
>  www/datastore/Content.js              |  77 +++++++++++++++++-
>  www/datastore/Prune.js                |   4 +
>  12 files changed, 483 insertions(+), 38 deletions(-)
> 
> -- 
> 2.30.2




More information about the pbs-devel mailing list