From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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 3EF375BC73
for <pve-devel@lists.proxmox.com>; Wed, 8 Jul 2020 11:08:42 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2D03C2EEDE
for <pve-devel@lists.proxmox.com>; Wed, 8 Jul 2020 11:08:12 +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 F37E42EECE
for <pve-devel@lists.proxmox.com>; Wed, 8 Jul 2020 11:08:10 +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 B934C40769
for <pve-devel@lists.proxmox.com>; Wed, 8 Jul 2020 11:08:10 +0200 (CEST)
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Reiter <s.reiter@proxmox.com>
References: <20200708084228.20119-1-s.reiter@proxmox.com>
<20200708084228.20119-2-s.reiter@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Message-ID: <baf29585-e4e6-89dc-7fc0-c4e26cac272e@proxmox.com>
Date: Wed, 8 Jul 2020 11:08:09 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
Thunderbird/78.0
MIME-Version: 1.0
In-Reply-To: <20200708084228.20119-2-s.reiter@proxmox.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
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: Re: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 08 Jul 2020 09:08:42 -0000
On 08.07.20 10:42, Stefan Reiter wrote:
> If 'query-proxmox-support' is not known to QEMU, assume that no other
> features are supported either.
>
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
>
> 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") } // {};
can we not fall back and instead use undef here to error out with a nice
"does not support PBS at all" message?
> +
> 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) };
>