From d4e8a1f27c66337a04461f2a593f416f61daaed5 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Mon, 23 Nov 2020 13:33:09 +0100 Subject: [PATCH] convert maxfiles to prune_backups when reading the storage configuration If there are already prune options configured, simply delete the maxfiles setting. Having set both is invalid from vzdump's perspective anyways, and any backup job on such a storage failed, meaning a user would've noticed. If there are no prune options, translate the maxfiles value to keep-last, except for maxfiles being zero (=unlimited), in which case we use keep-all. If both are not set, don't set anything, so: 1. Storages don't suddenly have retention options set. 2. People relying on vzdump defaults can still use those. Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 7314085..8d904d7 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -129,6 +129,28 @@ sub lock_storage_config { } } +# FIXME remove maxfiles for PVE 7.0 +my $convert_maxfiles_to_prune_backups = sub { + my ($scfg) = @_; + + return if !$scfg; + + my $maxfiles = delete $scfg->{maxfiles}; + + if (!defined($scfg->{'prune-backups'}) && defined($maxfiles)) { + my $prune_backups; + if ($maxfiles) { + $prune_backups = { 'keep-last' => $maxfiles }; + } else { # maxfiles 0 means no limit + $prune_backups = { 'keep-all' => 1 }; + } + $scfg->{'prune-backups'} = PVE::JSONSchema::print_property_string( + $prune_backups, + 'prune-backups' + ); + } +}; + sub storage_config { my ($cfg, $storeid, $noerr) = @_; @@ -138,6 +160,8 @@ sub storage_config { die "storage '$storeid' does not exist\n" if (!$noerr && !$scfg); + $convert_maxfiles_to_prune_backups->($scfg); + return $scfg; }