all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: "Michael Köppl" <m.koeppl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container v6 3/4] fix #3711: lxc: allow removing unused mp if storage no longer exists
Date: Tue, 20 May 2025 11:08:14 +0200	[thread overview]
Message-ID: <20250520090818.44881-4-m.koeppl@proxmox.com> (raw)
In-Reply-To: <20250520090818.44881-1-m.koeppl@proxmox.com>

Detaching a mount point with a removed underlying storage causes it to
be labeled as an unused disk. With this change, removing an unused disk
with a removed underlying storage causes it to be removed from the
configuration instead of failing. Deleting the mount point is skipped in
this case to avoid failing and to allow removing the unused volume from
the CT configuration and to achieve behavior consistent with destroying
a CT.

Originally-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>
---
 src/PVE/LXC/Config.pm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index a7c1023..8c96691 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -1470,11 +1470,17 @@ sub vmconfig_hotplug_pending {
     foreach my $opt (sort keys %$pending_delete_hash) {
 	next if $selection && !$selection->{$opt};
 	eval {
+	    my $mp = $class->parse_volume($opt, $conf->{$opt});
+	    my ($storeid, undef) = PVE::Storage::parse_volume_id($mp->{volume});
+
 	    if ($LXC_FASTPLUG_OPTIONS->{$opt}) {
 		# pass
-	    } elsif ($opt =~ m/^unused(\d+)$/) {
+	    } elsif (
+		$opt =~ m/^unused(\d+)$/
+		&& PVE::Storage::storage_config($storecfg, $storeid, 1)
+	    ) {
 		PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $conf->{$opt})
-		    if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
+		    if !$class->is_volume_in_use($conf, $mp->{volume}, 1, 1);
 	    } elsif ($opt eq 'swap') {
 		$hotplug_memory->(undef, 0);
 	    } elsif ($opt eq 'cpulimit') {
@@ -1558,13 +1564,17 @@ sub vmconfig_apply_pending {
 	next if $selection && !$selection->{$opt};
 	eval {
 	    my $mp = $class->parse_volume($opt, $conf->{$opt});
+	    my ($storeid, undef) = PVE::Storage::parse_volume_id($mp->{volume});
 
 	    if ($opt =~ m/^mp(\d+)$/) {
 		if ($mp->{type} eq 'volume') {
 		    $class->add_unused_volume($conf, $mp->{volume})
 			if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
 		}
-	    } elsif ($opt =~ m/^unused(\d+)$/) {
+	    } elsif (
+		$opt =~ m/^unused(\d+)$/
+		&& PVE::Storage::storage_config($storecfg, $storeid, 1)
+	    ) {
 		# $mp->{volume} is used for is_volume_in_use() because parse_volume()
 		# knows about 'unused*' and will return a valid volume ID whereas
 		# $conf->{$opt} is not guaranteed to contain a valid volume ID in this
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

  parent reply	other threads:[~2025-05-20  9:08 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-20  9:08 [pve-devel] [PATCH container/qemu-server v6 0/7] fix #3711 and adapt drive detach/remove behavior Michael Köppl
2025-05-20  9:08 ` [pve-devel] [PATCH container v6 1/4] fix #3711: lxc: print warning if storage for mounted volume does not exist anymore Michael Köppl
2025-05-20 13:33   ` Fiona Ebner
2025-05-22  6:08     ` Thomas Lamprecht
2025-05-27  7:37       ` Michael Köppl
2025-05-22  6:17   ` Thomas Lamprecht
2025-05-27  7:29     ` Michael Köppl via pve-devel
2025-05-20  9:08 ` [pve-devel] [PATCH container v6 2/4] config: apply_pending: get unused volid through parse_volume() Michael Köppl
2025-05-20 13:45   ` Fiona Ebner
2025-05-20 13:49     ` Fiona Ebner
2025-05-20  9:08 ` Michael Köppl [this message]
2025-05-20 14:03   ` [pve-devel] [PATCH container v6 3/4] fix #3711: lxc: allow removing unused mp if storage no longer exists Fiona Ebner
2025-05-27  9:34     ` Michael Köppl
2025-05-27 10:03       ` Fiona Ebner
2025-05-20  9:08 ` [pve-devel] [PATCH container v6 4/4] add linked clone check when destroying container Michael Köppl
2025-05-20 14:13   ` Fiona Ebner
2025-05-20  9:08 ` [pve-devel] [PATCH qemu-server v6 1/3] adapt linked clone check to not die if an error occurs during check Michael Köppl
2025-05-21 10:49   ` Fiona Ebner
2025-05-20  9:08 ` [pve-devel] [PATCH qemu-server v6 2/3] print warning for PVE::Storage::path errors instead of failing Michael Köppl
2025-05-21 11:02   ` Fiona Ebner
2025-05-20  9:08 ` [pve-devel] [PATCH qemu-server v6 3/3] mark volumes pending detach as unused if storage was removed Michael Köppl
2025-05-21 11:16   ` Fiona Ebner
2025-05-26 12:24     ` Michael Köppl
2025-05-27 16:05 ` [pve-devel] superseded: [PATCH container/qemu-server v6 0/7] fix #3711 and adapt drive detach/remove behavior Michael Köppl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250520090818.44881-4-m.koeppl@proxmox.com \
    --to=m.koeppl@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal