[pve-devel] [PATCH-SERIES v2 manager/storage] fix #3307: allow backups to be marked as protected

Fabian Ebner f.ebner at proxmox.com
Thu Sep 30 13:42:03 CEST 2021


Protected bacukps cannot be removed accidentally and will be ignored
for pruning. A <backup>.protected file serves as a protection marker
for file-based storages.


Changes from v1:
    * Avoid races when using unlink.
    * Also add fall-back for {get, update}_volume_notes to other
      plugin implementations, because external plugins might be
      derived from those too.
    * Add UI integration patches.


For the storage part, an APIAGE+APIVER bump is needed.
Dependency bump from pve-manager to pve-storage is needed.


To work, the PBS integration needs Dominik's patches for PBS (seems
like a rebase is needed for those, I tested on top of v2.0.10):
https://lists.proxmox.com/pipermail/pbs-devel/2021-September/004099.html


pve-storage:

Fabian Ebner (7):
  dir plugin: update notes: don't fail if file is already removed
  dir plugin: get notes: return undef if notes are not supported
  add generalized functions to manage volume attributes
  prune mark: preserve additional information for the keep-all case
  fix #3307: make it possible to set protection for backups
  prune: mark renamed and protected backups differently
  pbs: integrate support for protected

 PVE/API2/Storage/Content.pm      | 36 ++++++++++---
 PVE/API2/Storage/PruneBackups.pm |  5 +-
 PVE/Storage.pm                   | 23 +++++---
 PVE/Storage/BTRFSPlugin.pm       |  4 +-
 PVE/Storage/CIFSPlugin.pm        | 13 +++++
 PVE/Storage/CephFSPlugin.pm      | 12 +++++
 PVE/Storage/DirPlugin.pm         | 62 +++++++++++++++++++++-
 PVE/Storage/NFSPlugin.pm         | 13 +++++
 PVE/Storage/PBSPlugin.pm         | 90 +++++++++++++++++++++++++++++++-
 PVE/Storage/Plugin.pm            | 45 +++++++++++++++-
 test/prune_backups_test.pm       | 17 +++++-
 11 files changed, 296 insertions(+), 24 deletions(-)


pve-manager:

Fabian Ebner (5):
  vzdump: skip protected backups for dumpdir pruning
  ui: storage content: avoid redundant options hasNotesColumn and
    hideColumns
  ui: backup views: add protected column
  ui: backup views: add button to change protection status
  ui: prune: also handle new 'renamed' keep reason

 PVE/VZDump.pm                       |  7 +++++++
 www/manager6/grid/BackupView.js     | 25 +++++++++++++++++++++++++
 www/manager6/storage/BackupView.js  | 18 ++++++++++++++++++
 www/manager6/storage/Browser.js     |  1 -
 www/manager6/storage/ContentView.js | 20 ++++++++++++++------
 www/manager6/window/Prune.js        |  2 ++
 6 files changed, 66 insertions(+), 7 deletions(-)

-- 
2.30.2





More information about the pve-devel mailing list