yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prune: allow having all prune options zero/missing

Browse Source 
This is basically necessary for the GUI's prune widget, because we want to
pass along all options equal to zero when all the number fields are cleared.
And it's more similar to how it's done in PBS now.

Bumped the APIAGE and APIVER, in case some external plugin needs to adapt to
the now less restrictive schema for 'prune-backups'.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2020-11-13 14:08:55 +01:00
committed by Thomas Lamprecht
parent f514181d28
commit 343ca2570c
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/Storage.pm
View File

@ -41,11 +41,11 @@ use PVE::Storage::DRBDPlugin;
use PVE::Storage::PBSPlugin;
# Storage API version. Increment it on changes in storage API interface.
use constant APIVER => 7;
use constant APIVER => 8;
# Age is the number of versions we're backward compatible with.
# This is like having 'current=APIVER' and age='APIAGE' in libtool,
# see https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
use constant APIAGE => 6;
use constant APIAGE => 7;
# load standard plugins
PVE::Storage::DirPlugin->register();

10
PVE/Storage/Plugin.pm
View File

@ -82,15 +82,7 @@ our $prune_backups_format = {
'than one backup for a single year, only the latest one is kept.'
},
};
PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&validate_prune_backups);
sub validate_prune_backups {
my ($keep) = @_;
die "at least one keep-option must be set and positive\n"
if !grep { $_ } values %{$keep};
return $keep;
}
PVE::JSONSchema::register_format('prune-backups', $prune_backups_format);
register_standard_option('prune-backups', {
description => "The retention options with shorter intervals are processed first " .
"with --keep-last being the very first one. Each option covers a " .