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 AAC2F70871 for ; Wed, 29 Sep 2021 11:45:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D48511ED9 for ; Wed, 29 Sep 2021 11:45:15 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 264EA11ECE for ; Wed, 29 Sep 2021 11:45:15 +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 F3F3B44B86 for ; Wed, 29 Sep 2021 11:45:14 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 29 Sep 2021 11:45:07 +0200 Message-Id: <20210929094507.1566495-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210929094507.1566495-1-f.gruenbichler@proxmox.com> References: <20210929094507.1566495-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.347 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 qemu-server] vm_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:45 -0000 if a volume is only referenced in the pending section of a config it was previously not removed when removing the VM, 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 --- PVE/QemuServer.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0fb8628..e8047e8 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2172,16 +2172,19 @@ sub destroy_vm { }); } + my $volids = {}; my $remove_owned_drive = sub { my ($ds, $drive) = @_; return if drive_is_cdrom($drive, 1); my $volid = $drive->{file}; return if !$volid || $volid =~ m|^/|; + return if $volids->{$volid}; my ($path, $owner) = PVE::Storage::path($storecfg, $volid); return if !$path || !$owner || ($owner != $vmid); + $volids->{$volid} = 1; eval { PVE::Storage::vdisk_free($storecfg, $volid) }; warn "Could not remove disk '$volid', check manually: $@" if $@; }; @@ -2200,6 +2203,8 @@ sub destroy_vm { $remove_owned_drive->('vmstate', $drive); } + PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $remove_owned_drive); + if ($purge_unreferenced) { # also remove unreferenced disk my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images'); PVE::Storage::foreach_volid($vmdisks, sub { -- 2.30.2