[pve-devel] [PATCH manager 1/2] vzdump: warn when both storage and dumpdir are defined in vzdump.conf

[pve-devel] [PATCH manager 1/2] vzdump: warn when both storage and dumpdir are defined in vzdump.conf

[Fabian Ebner]

and prefer storage, because the storage configuration might contain more
settings. Warning is preferable over dying, because all backups would be
affected (even if they don't use the vzdump.conf parameters) and the settings
could've been compatible (i.e. dumpdir being the storage's dump dir). Previously
one of the two options would randomly be chosen in the loop in new(), because of
perl hash iteration.

Reported here: https://forum.proxmox.com/threads/vzdump-times-out-very-often-on-zfs-storage-pool.80035/post-354277

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/VZDump.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 6892918f..2e44908a 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -230,6 +230,11 @@ sub read_vzdump_defaults {
 	$res->{$key} = $defaults->{$key} if !defined($res->{$key});
     }
 
+    if (defined($res->{storage}) && defined($res->{dumpdir})) {
+	debugmsg('warn', "both 'storage' and 'dumpdir' defined in '$fn' - ignoring 'dumpdir'");
+	delete $res->{dumpdir};
+    }
+
     $parse_prune_backups_maxfiles->($res, "options in '$fn'");
 
     return $res;
-- 
2.20.1

[pve-devel] [PATCH manager 2/2] vzdump: use debugmsg instead of warn

[Fabian Ebner]

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/VZDump.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 2e44908a..6a4e641b 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -75,7 +75,7 @@ my $parse_prune_backups_maxfiles = sub {
     my $maxfiles = delete $param->{maxfiles};
     my $prune_backups = $param->{'prune-backups'};
 
-    warn "both 'maxfiles' and 'prune-backups' defined as ${kind} - ignoring 'maxfiles'\n"
+    debugmsg('warn', "both 'maxfiles' and 'prune-backups' defined as ${kind} - ignoring 'maxfiles'")
         if defined($maxfiles) && defined($prune_backups);
 
     if (defined($prune_backups)) {
-- 
2.20.1

[pve-devel] applied-series: [PATCH manager 1/2] vzdump: warn when both storage and dumpdir are defined in vzdump.conf

[Thomas Lamprecht]

On 04.12.20 10:15, Fabian Ebner wrote:
> and prefer storage, because the storage configuration might contain more
> settings. Warning is preferable over dying, because all backups would be
> affected (even if they don't use the vzdump.conf parameters) and the settings
> could've been compatible (i.e. dumpdir being the storage's dump dir). Previously
> one of the two options would randomly be chosen in the loop in new(), because of
> perl hash iteration.
> 
> Reported here: https://forum.proxmox.com/threads/vzdump-times-out-very-often-on-zfs-storage-pool.80035/post-354277
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/VZDump.pm | 5 +++++
>  1 file changed, 5 insertions(+)
> 
>

applied both patches, thanks!