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 2274E82E3A for ; Wed, 1 Dec 2021 16:11:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1065EFA4E for ; Wed, 1 Dec 2021 16:10:40 +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 id 69B67FA42 for ; Wed, 1 Dec 2021 16:10:39 +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 35CAF45F4A for ; Wed, 1 Dec 2021 16:10:39 +0100 (CET) Date: Wed, 1 Dec 2021 16:10:37 +0100 From: Oguz Bektas To: Fabian Ebner Cc: pve-devel@lists.proxmox.com Message-ID: Mail-Followup-To: Oguz Bektas , Fabian Ebner , pve-devel@lists.proxmox.com References: <20211201120036.427418-1-o.bektas@proxmox.com> <6b75b431-83f1-8010-4c93-fa74c1b73b6f@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6b75b431-83f1-8010-4c93-fa74c1b73b6f@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.739 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] apply pending changes at vm stop only if the section is not empty 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, 01 Dec 2021 15:11:10 -0000 On Wed, Dec 01, 2021 at 03:10:28PM +0100, Fabian Ebner wrote: > Am 01.12.21 um 13:00 schrieb Oguz Bektas: > > we also have the same skipping logic when starting vms. this way we > > avoid calling 'write_config' when there are no present changes to > > commit. > > > > Signed-off-by: Oguz Bektas > > --- > > PVE/QemuServer.pm | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > > index 45b704d..1379f33 100644 > > --- a/PVE/QemuServer.pm > > +++ b/PVE/QemuServer.pm > > @@ -4998,6 +4998,8 @@ sub vmconfig_delete_or_detach_drive { > > sub vmconfig_apply_pending { > > my ($vmid, $conf, $storecfg, $errors) = @_; > > + return if !scalar(keys %{$conf->{pending}}); > > Isn't this part of the patch enough? For the caller while starting a VM you > mentioned, there is an additional load_config() that is skipped if there are > no pending changes, but for the two callers below, there is no such benefit. > They just indicate that any pending changes should be applied, which is fine > even if there are none. yes i guess it's alright to keep this part only :) though we could still avoid the vmconfig_apply_pending call in vm_stop_cleanup completely if the section is empty anyway. not that it brings much but still it should be fine.. > > > + > > my $add_apply_error = sub { > > my ($opt, $msg) = @_; > > my $err_msg = "unable to apply pending change $opt : $msg"; > > @@ -5889,7 +5891,7 @@ sub _do_vm_stop { > > die "VM quit/powerdown failed - got timeout\n"; > > } > > } else { > > - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf; > > + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf; > > Style nit: >100 characters > > > return; > > } > > } else { > > @@ -5920,7 +5922,7 @@ sub _do_vm_stop { > > sleep 1; > > } > > - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf; > > + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf; > > } > > # Note: use $nocheck to skip tests if VM configuration file exists. > >