From fb9f512c19e7419e0ada97cc2ff855994e851947 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Wed, 8 Jul 2020 11:57:54 +0200 Subject: [PATCH] backup: detect PBS features and use only supported If 'query-proxmox-support' is not known to QEMU, assume that no other features are supported either. If 'pbs' is not supported at all, error out with a nice message. Signed-off-by: Stefan Reiter Signed-off-by: Thomas Lamprecht --- PVE/VZDump/QemuServer.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 567088cb..b8bf44af 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -443,6 +443,12 @@ sub archive_pbs { die "interrupted by signal\n"; }; + my $qemu_support = eval { mon_cmd($vmid, "query-proxmox-support") }; + if (!$qemu_support) { + die "PBS backups are not supported by the running QEMU version. Please make " + . "sure you've installed the latest version and the VM has been restarted.\n"; + } + my $fs_frozen = $self->qga_fs_freeze($task, $vmid); my $params = { @@ -453,11 +459,12 @@ sub archive_pbs { password => $password, devlist => $devlist, 'config-file' => $conffile, - 'use-dirty-bitmap' => JSON::true, }; $params->{fingerprint} = $fingerprint if defined($fingerprint); $params->{'firewall-file'} = $firewall if -e $firewall; + $params->{'use-dirty-bitmap'} = JSON::true if $qemu_support->{'pbs-dirty-bitmap'}; + $params->{timeout} = 60; # give some time to connect to the backup server my $res = eval { mon_cmd($vmid, "backup", %$params) };