[pve-devel] [PATCH-SERIES v4] fix #2649: introduce prune-backups property for storages supporting backups

Fabian Ebner f.ebner at proxmox.com
Thu Jul 9 14:45:40 CEST 2020


A new 'prune-backups' option is introduced for storages as well as for vzdump

Patches #1-#3 introduces prune-backups in the backend
Patch #4 introduces the new vzdump parameter
Patch #6 is the 'real' change needed for vzdump.
Patch #7 gets rid of 'maxfiles' internally, re-using 'prune-backups' instead.


Changes from v3:
    * Error handling for the prune_backup functions, to allow
      pruning other groups if one fails
    * Allow passing a logfunc in prune_backups (useful for vzdump)
    * Use new property string validation
    * Make prune-backups also a vzdump option
    * Introduce a wrapper for pvesm prune-backups and redirect call
      to API according to --dry-run
    * Also allow filtering by type
    * prune_mark: merge loops
    * Add more tests

Non-standard backups are ignored when pruning. I chose 'protected'
to mark those, 'ignore' could also be used. Backups are grouped
by type+ID.

The backup type from PBS is translated: ct->lxc, vm->qemu, so that the
possible values for the API result don't depend on the backend.

Dependency bumps 'manager -> storage' and 'manager -> guest-common -> storage' are needed


storage:

Fabian Ebner (3):
  Introduce prune-backups property for directory-based storages
  Add prune_backups to storage API
  Add API and pvesm call for prune_backups

 PVE/API2/Storage/Makefile        |   2 +-
 PVE/API2/Storage/PruneBackups.pm | 164 +++++++++++++++
 PVE/API2/Storage/Status.pm       |   7 +
 PVE/CLI/pvesm.pm                 | 126 ++++++++++++
 PVE/Storage.pm                   |  91 +++++++-
 PVE/Storage/CIFSPlugin.pm        |   1 +
 PVE/Storage/CephFSPlugin.pm      |   1 +
 PVE/Storage/DirPlugin.pm         |   5 +-
 PVE/Storage/GlusterfsPlugin.pm   |   5 +-
 PVE/Storage/NFSPlugin.pm         |   5 +-
 PVE/Storage/PBSPlugin.pm         |  69 +++++++
 PVE/Storage/Plugin.pm            | 124 ++++++++++-
 test/prune_backups_test.pm       | 342 +++++++++++++++++++++++++++++++
 test/run_plugin_tests.pl         |   1 +
 14 files changed, 933 insertions(+), 10 deletions(-)
 create mode 100644 PVE/API2/Storage/PruneBackups.pm
 create mode 100644 test/prune_backups_test.pm


guest-common:

Fabian Ebner (1):
  Add prune-backups option to vzdump parameters

 PVE/VZDump/Common.pm | 4 ++++
 1 file changed, 4 insertions(+)


manager:

Fabian Ebner (3):
  make use of archive_info and archive_remove
  Allow prune-backups as an alternative to maxfiles
  Always use prune-backups instead of maxfiles internally

 PVE/API2/VZDump.pm |  4 +-
 PVE/VZDump.pm      | 93 ++++++++++++++++++++++++++++++----------------
 2 files changed, 63 insertions(+), 34 deletions(-)

-- 
2.20.1






More information about the pve-devel mailing list