From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C02A05BC52 for ; Wed, 8 Jul 2020 10:51:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BCA682EA60 for ; Wed, 8 Jul 2020 10:51:25 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6F48F2EA4E for ; Wed, 8 Jul 2020 10:51:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4911B42ABD for ; Wed, 8 Jul 2020 10:42:40 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Wed, 8 Jul 2020 10:42:28 +0200 Message-Id: <20200708084228.20119-2-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200708084228.20119-1-s.reiter@proxmox.com> References: <20200708084228.20119-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 2/2] backup: use dirty-bitmap for PBS only if supported by QEMU X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2020 08:51:25 -0000 If 'query-proxmox-support' is not known to QEMU, assume that no other features are supported either. Signed-off-by: Stefan Reiter --- Does not require any version bumps, since it handles failure gracefully. PVE/VZDump/QemuServer.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 567088c..3c2a334 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -443,6 +443,8 @@ sub archive_pbs { die "interrupted by signal\n"; }; + my $qemu_support = eval { mon_cmd($vmid, "query-proxmox-support") } // {}; + my $fs_frozen = $self->qga_fs_freeze($task, $vmid); my $params = { @@ -453,11 +455,13 @@ 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) }; -- 2.20.1