prune: allow having all prune options zero/missing

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>

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index a2f400cddcd8264fe96fa2927f297271018c055c..bd6e15e9f1f9f05dec9a6cbcd88391705ff08212 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -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();

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index b4f3be860f98d25732e1575f08b084bca33aea45..fe56864cc177e512bbe3e50df2f688700cd708a3 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -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 " .