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 153DF942F2 for ; Thu, 23 Feb 2023 12:30:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E61C124003 for ; Thu, 23 Feb 2023 12:29:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Thu, 23 Feb 2023 12:29:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 13B89482F7 for ; Thu, 23 Feb 2023 12:29:30 +0100 (CET) Date: Thu, 23 Feb 2023 12:29:28 +0100 From: Christoph Heiss To: Thomas Lamprecht Cc: Proxmox VE development discussion Message-ID: <20230223112928.zisx7i5rbtwhskgq@maui.proxmox.com> References: <20230201125918.372665-1-c.heiss@proxmox.com> <20230201125918.372665-2-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL -0.095 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 1/3] vzdump: Add VM QGA option to skip `fs-freeze`/`fs-thaw` on backup 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: Thu, 23 Feb 2023 11:30:03 -0000 Thanks for the review! On Thu, Feb 23, 2023 at 11:55:55AM +0100, Thomas Lamprecht wrote: > Am 01/02/2023 um 13:59 schrieb Christoph Heiss: > > Signed-off-by: Christoph Heiss > > --- > > PVE/QemuServer.pm | 8 +++++++- > > PVE/VZDump/QemuServer.pm | 5 +++++ > > 2 files changed, 12 insertions(+), 1 deletion(-) > > > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > > index e4d1a70..e409db1 100644 > > --- a/PVE/QemuServer.pm > > +++ b/PVE/QemuServer.pm > > @@ -160,7 +160,13 @@ my $agent_fmt = { > > description => "Run fstrim after moving a disk or migrating the VM.", > > type => 'boolean', > > optional => 1, > > - default => 0 > > + default => 0, > > + }, > > + fsfreeze_thaw => { > > Please rename this to: > > 'freeze-fs-on-backup' Will do, I wasn't really all that happy with the option name anyway. > > > > + description => "Freeze/thaw filesystems on backup for consistency.", > > detail/nit: s/filesystems/guest filesystem/ Ack. > > > + type => 'boolean', > > + optional => 1, > > + default => 1, > > }, > > type => { > > description => "Select the agent type", > > diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm > > index 0eb5ec6..5ff46f7 100644 > > --- a/PVE/VZDump/QemuServer.pm > > +++ b/PVE/VZDump/QemuServer.pm > > @@ -862,6 +862,11 @@ sub qga_fs_freeze { > > return; > > } > > > > + if (!PVE::QemuServer::get_qga_key($self->{vmlist}->{$vmid}, 'fsfreeze_thaw')) { > > this is wrong as get_qga_key which uses parse_guest_agent which uses parse_property_string > doesn't sets the default from the schema on parse, so you'd also skip if it's not defined > (please negative test changes too) Good to know! I don't remember if I tested it with an unchanged/fresh VM, but I guess not (and it was also some time ago). I'll change it as suggested below and do more thorough testing of such cases too for the next spin. > > Rather do something like: > > my $freeze = PVE::QemuServer::get_qga_key($self->{vmlist}->{$vmid}, 'freeze-fs-on-backup') // 1; > if (!$freeze) { > # ... > > > + $self->loginfo("skipping guest-agent 'fs-freeze', disabled in VM options"); > > + return; > > + } > > + > > $self->loginfo("issuing guest-agent 'fs-freeze' command"); > > eval { mon_cmd($vmid, "guest-fsfreeze-freeze") }; > > $self->logerr($@) if $@; > >