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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7BED5BB184 for ; Fri, 22 Mar 2024 16:17:45 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6365989F6 for ; Fri, 22 Mar 2024 16:17:45 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 22 Mar 2024 16:17:44 +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 1798B419EF for ; Fri, 22 Mar 2024 16:17:44 +0100 (CET) Message-ID: <67e8a20d-c9a7-4946-8f83-179303e097dd@proxmox.com> Date: Fri, 22 Mar 2024 16:17:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Dominik Csapak References: <20240320125158.2094900-1-d.csapak@proxmox.com> <20240320125158.2094900-3-d.csapak@proxmox.com> From: Fiona Ebner In-Reply-To: <20240320125158.2094900-3-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.074 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 2/3] migrate: call vm_stop_cleanup after stopping in phase3_cleanup 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: Fri, 22 Mar 2024 15:17:45 -0000 Am 20.03.24 um 13:51 schrieb Dominik Csapak: > @@ -1591,12 +1593,10 @@ sub phase3_cleanup { > $self->{errors} = 1; > } > > - # always deactivate volumes - avoid lvm LVs to be active on several nodes > - eval { > - PVE::Storage::deactivate_volumes($self->{storecfg}, $sourcevollist); > - }; > + # stop with nocheck does not do a cleanup, so do it here with the original config > + eval { PVE::QemuServer::vm_stop_cleanup($self->{storecfg}, $vmid, $oldconf, 0) }; The function has more parameters, so this does not set noerr to 0. > if (my $err = $@) { > - $self->log('err', $err); > + $self->log('err', "cleanup for vm failed - $err"); > $self->{errors} = 1; > } > > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm > index d53e9693..54f73093 100644 > --- a/PVE/QemuServer.pm > +++ b/PVE/QemuServer.pm > @@ -6160,7 +6160,9 @@ sub cleanup_pci_devices { > } > > sub vm_stop_cleanup { > - my ($storecfg, $vmid, $conf, $keepActive, $apply_pending_changes) = @_; > + my ($storecfg, $vmid, $conf, $keepActive, $apply_pending_changes, $noerr) = @_; > + > + $noerr //= 1; # defaults to warning Not too happy about this, because usually passing undef and 0 for a "boolean" is the same, but not here. And Perl won't help you. There's not many callers, maybe just adapt them instead? Should be its own patch then. > > eval { > > @@ -6186,7 +6188,13 @@ sub vm_stop_cleanup { > > vmconfig_apply_pending($vmid, $conf, $storecfg) if $apply_pending_changes; > }; > - warn $@ if $@; # avoid errors - just warn > + if (my $err = $@) { > + if ($noerr) { > + warn $err; > + } else { > + die $err; > + } Style nit: we usually have something like die $err if !$noerr; warn $err; which avoids the line bloat. > + } > } > > # call only in locked context