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 3B84C707EF for ; Wed, 29 Sep 2021 11:45:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3948011E84 for ; Wed, 29 Sep 2021 11:45:12 +0200 (CEST) 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 id B3D6811E63 for ; Wed, 29 Sep 2021 11:45:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8B17044B81 for ; Wed, 29 Sep 2021 11:45:11 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 29 Sep 2021 11:45:06 +0200 Message-Id: <20210929094507.1566495-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.349 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 Subject: [pve-devel] [PATCH container] destroy: remove pending volumes as well 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, 29 Sep 2021 09:45:12 -0000 if a volume is only referenced in the pending section of a config it was previously not removed when removing the CT, unless the non-default 'remove unreferenced disks' option was enabled. keeping track of volume IDs which we attempt to remove gets rid of false warnings in case a volume is referenced both in the config and the pending section, or multiple times in the config for other reasons. Signed-off-by: Fabian Grünbichler --- src/PVE/LXC.pm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index dbdec23..b07d986 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -864,10 +864,20 @@ sub delete_mountpoint_volume { sub destroy_lxc_container { my ($storage_cfg, $vmid, $conf, $replacement_conf, $purge_unreferenced) = @_; - PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, sub { + my $volids = {}; + my $remove_volume = sub { my ($ms, $mountpoint) = @_; - delete_mountpoint_volume($storage_cfg, $vmid, $mountpoint->{volume}); - }); + + my $volume = $mountpoint->{volume}; + + return if $volids->{$volume}; + $volids->{$volume} = 1; + + delete_mountpoint_volume($storage_cfg, $vmid, $volume); + }; + PVE::LXC::Config->foreach_volume_full($conf, {include_unused => 1}, $remove_volume); + + PVE::LXC::Config->foreach_volume_full($conf->{pending}, {include_unused => 1}, $remove_volume); if ($purge_unreferenced) { # also remove unreferenced disk my $vmdisks = PVE::Storage::vdisk_list($storage_cfg, undef, $vmid, undef, 'rootdir'); -- 2.30.2