[pve-devel] [PATCH stable-7 manager 1/2] pve7to8: remove outdated warning about retention

[pve-devel] [PATCH stable-7 manager 1/2] pve7to8: remove outdated warning about retention

[Fiona Ebner]

It just talks about the default behavior since PVE 7. It's rather
confusing to mention this, because the behavior doesn't change anymore
in PVE 8.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Intended for both master and stable-7.

 PVE/CLI/pve7to8.pm | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 6b51e98e..87dc1dc3 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -608,8 +608,6 @@ sub check_backup_retention_settings {
 
     my $pass = 1;
 
-    my $node_has_retention;
-
     my $maxfiles_msg = "parameter 'maxfiles' is deprecated with PVE 7.x and will be removed in a " .
 	"future version, use 'prune-backups' instead.";
 
@@ -626,8 +624,6 @@ sub check_backup_retention_settings {
 	    $pass = 0;
 	    log_warn("$fn - $maxfiles_msg");
 	}
-
-	$node_has_retention = defined($param->{maxfiles}) || defined($param->{'prune-backups'});
     };
     if (my $err = $@) {
 	$pass = 0;
@@ -643,15 +639,6 @@ sub check_backup_retention_settings {
 	    $pass = 0;
 	    log_warn("storage '$storeid' - $maxfiles_msg");
 	}
-
-	next if !$scfg->{content}->{backup};
-	next if defined($scfg->{maxfiles}) || defined($scfg->{'prune-backups'});
-	next if $node_has_retention;
-
-	log_info(
-	    "storage '$storeid' - no backup retention settings defined - by default, since PVE 7.0"
-	    ." it will no longer keep only the last backup, but all backups"
-	);
     }
 
     eval {
-- 
2.39.2

[pve-devel] [PATCH stable-7 manager 2/2] pve7to8: avoid confusing warning about required setting 'storage' for vzdump

[Fiona Ebner]

It's required in the schema for notes-template and protected, but when
parsing vzdump.conf, it shouldn't matter whether the storage parameter
is set or not.

The warning is ugly and users might interpret it as something that
needs to be acted upon for the upgrade:
parse error in '/etc/vzdump.conf' - 'storage': missing property - 'notes-template' requires this property\nmissing property - 'protected' requires this property

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Intended for both master and stable-7.

 PVE/CLI/pve7to8.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 87dc1dc3..2c288a2a 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -613,6 +613,8 @@ sub check_backup_retention_settings {
 
     eval {
 	my $confdesc = PVE::VZDump::Common::get_confdesc();
+	# vzdump.conf by itself doesn't need to honor any 'requires'
+	delete $confdesc->{$_}->{requires} for keys $confdesc->%*;
 
 	my $fn = "/etc/vzdump.conf";
 	my $raw = PVE::Tools::file_get_contents($fn);
-- 
2.39.2

[pve-devel] applied: [PATCH stable-7 manager 2/2] pve7to8: avoid confusing warning about required setting 'storage' for vzdump

[Thomas Lamprecht]

Am 21/06/2023 um 17:02 schrieb Fiona Ebner:
> It's required in the schema for notes-template and protected, but when
> parsing vzdump.conf, it shouldn't matter whether the storage parameter
> is set or not.
> 
> The warning is ugly and users might interpret it as something that
> needs to be acted upon for the upgrade:
> parse error in '/etc/vzdump.conf' - 'storage': missing property - 'notes-template' requires this property\nmissing property - 'protected' requires this property
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Intended for both master and stable-7.
> 
>  PVE/CLI/pve7to8.pm | 2 ++
>  1 file changed, 2 insertions(+)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH stable-7 manager 1/2] pve7to8: remove outdated warning about retention

[Thomas Lamprecht]

Am 21/06/2023 um 17:02 schrieb Fiona Ebner:
> It just talks about the default behavior since PVE 7. It's rather
> confusing to mention this, because the behavior doesn't change anymore
> in PVE 8.
> 
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Intended for both master and stable-7.
> 
>  PVE/CLI/pve7to8.pm | 13 -------------
>  1 file changed, 13 deletions(-)
> 
>

applied, thanks!