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 E7BDE8233 for ; Tue, 15 Nov 2022 11:55:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CA0A416E3 for ; Tue, 15 Nov 2022 11:55:59 +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, 15 Nov 2022 11:55:58 +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 1AB0D43E35 for ; Tue, 15 Nov 2022 11:55:58 +0100 (CET) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Tue, 15 Nov 2022 11:55:21 +0100 Message-Id: <20221115105526.3428334-2-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> References: <20221115105526.3428334-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL 0.034 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=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: [pve-devel] [PATCH V3 pve-container 1/6] 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, 15 Nov 2022 10:56:00 -0000 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 | 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.', + default => 0, + optional => 1, + } }, }, 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 && $@; }; PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, $remove_volume); -- 2.30.2