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 97ECA74664 for ; Mon, 19 Apr 2021 10:46:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8EC641256E for ; Mon, 19 Apr 2021 10:46:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 47FF712559 for ; Mon, 19 Apr 2021 10:46:50 +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 0C2EB45A90 for ; Mon, 19 Apr 2021 10:46:50 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 19 Apr 2021 10:46:42 +0200 Message-Id: <20210419084643.30634-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 1/2] destroy VM: always remove (referenced) VM state volumes 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: Mon, 19 Apr 2021 08:46:51 -0000 With --destroy-unreferenced-disks 0 they were not removed yet, but no use in keeping them around. Signed-off-by: Fabian Ebner --- PVE/QemuServer.pm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 1a46732..1af2b53 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2140,8 +2140,7 @@ sub destroy_vm { }); } - # only remove disks owned by this VM (referenced in the config) - PVE::QemuConfig->foreach_volume_full($conf, { include_unused => 1 }, sub { + my $remove_owned_drive = sub { my ($ds, $drive) = @_; return if drive_is_cdrom($drive, 1); @@ -2153,7 +2152,21 @@ sub destroy_vm { eval { PVE::Storage::vdisk_free($storecfg, $volid) }; warn "Could not remove disk '$volid', check manually: $@" if $@; - }); + }; + + # only remove disks owned by this VM (referenced in the config) + my $include_opts = { + include_unused => 1, + extra_keys => ['vmstate'], + }; + PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive); + + for my $snap (values %{$conf->{snapshots}}) { + next if !defined($snap->{vmstate}); + my $drive = PVE::QemuConfig->parse_volume('vmstate', $snap->{vmstate}, 1); + next if !defined($drive); + $remove_owned_drive->('vmstate', $drive); + } if ($purge_unreferenced) { # also remove unreferenced disk my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images'); -- 2.20.1