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.eb...@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 mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
