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 250ECEE72 for ; Tue, 13 Dec 2022 14:07:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 014ED1F991 for ; Tue, 13 Dec 2022 14:07:41 +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 ; Tue, 13 Dec 2022 14:07:40 +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 08B40424BB for ; Tue, 13 Dec 2022 14:07:40 +0100 (CET) Message-ID: Date: Tue, 13 Dec 2022 14:07:33 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, Stefan Hrdlicka References: <20221125144008.2988072-1-s.hrdlicka@proxmox.com> <20221125144008.2988072-2-s.hrdlicka@proxmox.com> From: Fiona Ebner In-Reply-To: <20221125144008.2988072-2-s.hrdlicka@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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. [lxc.pm] Subject: Re: [pve-devel] [PATCH V4 pve-container 1/7] fix #3711: optionally allow CT deletion to complete on disk volume removal errors 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: Tue, 13 Dec 2022 13:07:41 -0000 Am 25.11.22 um 15:40 schrieb Stefan Hrdlicka: > review fixes > - rename parameter to ignore-storage-errors > - move eval further up the call chain This should go... > > Signed-off-by: Stefan Hrdlicka > --- ...here to not clobber up the commit message > src/PVE/API2/LXC.pm | 8 ++++++++ > src/PVE/LXC.pm | 6 ++++-- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index 79aecaa..19806fa 100644 > --- a/src/PVE/API2/LXC.pm > +++ b/src/PVE/API2/LXC.pm > @@ -700,6 +700,13 @@ __PACKAGE__->register_method({ > ." enabled storages which are not referenced in the config.", > optional => 1, > }, > + 'ignore-storage-errors' => { > + type => 'boolean', > + description => 'If set, this will ignore errors when trying to remove' > + . ' container storage.', I'd rather use 'volumes' than 'storage' here. Or 'disks' which is already used in the 'destroy-unreferenced-disks' option. > + default => 0, > + optional => 1, > + } Style nit: missing comma (then the line doesn't need to be touched the next time an option is added ;)) > }, > }, > returns => { > @@ -761,6 +768,7 @@ __PACKAGE__->register_method({ > $conf, > { lock => 'destroyed' }, > $param->{'destroy-unreferenced-disks'}, > + $param->{'ignore-storage-errors'}, > ); > > PVE::AccessControl::remove_vm_access($vmid); > diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm > index 4bbd739..fe68f75 100644 > --- a/src/PVE/LXC.pm > +++ b/src/PVE/LXC.pm > @@ -861,7 +861,8 @@ sub delete_mountpoint_volume { > } > > sub destroy_lxc_container { > - my ($storage_cfg, $vmid, $conf, $replacement_conf, $purge_unreferenced) = @_; > + my ($storage_cfg, $vmid, $conf, $replacement_conf, > + $purge_unreferenced, $ignore_storage_errors) = @_; > > my $volids = {}; > my $remove_volume = sub { > @@ -872,7 +873,8 @@ sub destroy_lxc_container { > return if $volids->{$volume}; > $volids->{$volume} = 1; > > - delete_mountpoint_volume($storage_cfg, $vmid, $volume); > + eval { delete_mountpoint_volume($storage_cfg, $vmid, $volume); }; > + die $@ if !$ignore_storage_errors && $@; The commit message states that a warning is printed (which would be nice), but the error is completely ignored here? > }; > PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, $remove_volume); >