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 7544E8D6E6 for ; Tue, 8 Nov 2022 18:14:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 55071AB9E for ; Tue, 8 Nov 2022 18:14:20 +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 ; Tue, 8 Nov 2022 18:14:19 +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 6AF4540DAB for ; Tue, 8 Nov 2022 18:14:19 +0100 (CET) Message-ID: <5788e707-87b2-1357-7c25-cf04ef185baf@proxmox.com> Date: Tue, 8 Nov 2022 18:14:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:107.0) Gecko/20100101 Thunderbird/107.0 Content-Language: en-GB To: Proxmox VE development discussion , Stefan Hrdlicka References: <20220912152507.3498492-1-s.hrdlicka@proxmox.com> <20220912152507.3498492-3-s.hrdlicka@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220912152507.3498492-3-s.hrdlicka@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.033 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 V2 pve-container 2/8] fix #3711: enable delete of LXC container 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, 08 Nov 2022 17:14:20 -0000 "enable delete of LXC container" makes it sound like we couldn't delete a CT at all before and we know that it's about a LXC Container, we only understand those, so rather something like: "fix #3711: optionally allow CT deletion to complete on disk volume removal errors" Am 12/09/2022 um 17:25 schrieb Stefan Hrdlicka: > Make it possible to delete a container whoes underlying storage is no > longer available. This will just write an warning instead of dying. > > Without setting the option ignore-storage-errors=1 a delete will still > fail, like it did before the changes. With this option set it will try to > delete the volume from the storage. If this fails it writes a warning. > > review fixes > - rename parameter to ignore-storage-errors > - move eval further up the call chain > > Signed-off-by: Stefan Hrdlicka > --- > src/PVE/API2/LXC.pm | 8 ++++++++ > src/PVE/LXC.pm | 8 ++++++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index 589f96f..a7cd41d 100644 > --- a/src/PVE/API2/LXC.pm > +++ b/src/PVE/API2/LXC.pm > @@ -697,6 +697,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.', > + default => 0, > + optional => 1, > + } > }, > }, > returns => { > @@ -758,6 +765,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 fe63087..e380b12 100644 > --- a/src/PVE/LXC.pm > +++ b/src/PVE/LXC.pm > @@ -862,7 +862,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 { > @@ -873,7 +874,10 @@ 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); > + }; nit: style wise we often go for a one-liner like: eval { delete_mountpoint_volume($storage_cfg, $vmid, $volume) } (no hard feelings though, mostly commented due to already replying for the commit subject anyway) > + die $@ if !$ignore_storage_errors && $@; > }; > PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, $remove_volume); >