[PATCH container v9 05/10] allow pending mount point changes if storage is gone

["Michael Köppl" <m.koeppl@proxmox.com>]

Previously, applying a pending removal of an unused volume whose
backing storage was already removed would fail with "unable to apply
pending change unusedN", leaving a dangling reference that could never
be cleaned up.

Guard the volume deletion in vmconfig_apply_pending and
vmconfig_hotplug_pending with a check to ensure that the storage
exists. If the storage is gone, drop the entry with a warning instead of
trying to free a volume that no longer exists.

Apply the same check when a detached mount point is turned into an
'unusedN' entry, so a volume on a removed storage is not re-added as a
dangling unused entry, matching VM behavior.

Signed-off-by: Michael Köppl <m.koeppl@proxmox.com>
---
 src/PVE/LXC/Config.pm | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index c8098538..a3dd3a1a 100644
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -1663,8 +1663,14 @@ sub vmconfig_hotplug_pending {
                 # pass
             } elsif ($opt =~ m/^unused(\d+)$/) {
                 my $volid = $class->parse_volume($opt, $conf->{$opt})->{volume};
-                PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $volid)
-                    if !$class->is_volume_in_use($conf, $volid, 1, 1);
+                my ($storeid) = PVE::Storage::parse_volume_id($volid);
+                if (PVE::Storage::storage_config($storecfg, $storeid, 1)) {
+                    PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $volid)
+                        if !$class->is_volume_in_use($conf, $volid, 1, 1);
+                } else {
+                    PVE::RESTEnvironment::log_warn(
+                        "storage '$storeid' no longer exists, unused volume '$volid' will be removed");
+                }
             } elsif ($opt eq 'swap') {
                 $hotplug_memory->(undef, 0);
             } elsif ($opt eq 'cpulimit') {
@@ -1765,14 +1771,27 @@ sub vmconfig_apply_pending {
             if ($opt =~ m/^mp(\d+)$/) {
                 my $mp = $class->parse_volume($opt, $conf->{$opt});
                 if ($mp->{type} eq 'volume') {
-                    # FIXME: use $mp->{volume} for is_volume_in_use, fix conditions for check
-                    $class->add_unused_volume($conf, $mp->{volume})
-                        if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
+                    my ($storeid, undef) = PVE::Storage::parse_volume_id($mp->{volume});
+                    if (PVE::Storage::storage_config($storecfg, $storeid, 1)) {
+                        # FIXME: use $mp->{volume} for is_volume_in_use, fix conditions for check
+                        $class->add_unused_volume($conf, $mp->{volume})
+                            if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
+                    } else {
+                        PVE::RESTEnvironment::log_warn(
+                            "storage '$storeid' no longer exists, volume '$mp->{volume}' will be removed"
+                        );
+                    }
                 }
             } elsif ($opt =~ m/^unused(\d+)$/) {
                 my $volid = $class->parse_volume($opt, $conf->{$opt})->{volume};
-                PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $volid)
-                    if !$class->is_volume_in_use($conf, $volid, 1, 1);
+                my ($storeid) = PVE::Storage::parse_volume_id($volid);
+                if (PVE::Storage::storage_config($storecfg, $storeid, 1)) {
+                    PVE::LXC::delete_mountpoint_volume($storecfg, $vmid, $volid)
+                        if !$class->is_volume_in_use($conf, $volid, 1, 1);
+                } else {
+                    PVE::RESTEnvironment::log_warn(
+                        "storage '$storeid' no longer exists, unused volume '$volid' will be removed");
+                }
             } elsif ($opt =~ m/^net(\d+)$/) {
                 if ($have_sdn) {
                     my $net = $class->parse_lxc_network($conf->{$opt});
@@ -1891,8 +1910,14 @@ sub apply_pending_mountpoint {
     if (defined($old)) {
         my $mp = $class->parse_volume($opt, $old);
         if ($mp->{type} eq 'volume') {
-            $class->add_unused_volume($conf, $mp->{volume})
-                if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
+            my ($storeid) = PVE::Storage::parse_volume_id($mp->{volume});
+            if (PVE::Storage::storage_config($storecfg, $storeid, 1)) {
+                $class->add_unused_volume($conf, $mp->{volume})
+                    if !$class->is_volume_in_use($conf, $conf->{$opt}, 1, 1);
+            } else {
+                PVE::RESTEnvironment::log_warn(
+                    "storage '$storeid' no longer exists, volume '$mp->{volume}' will be removed");
+            }
         }
     }
 }
-- 
2.47.3