[pve-devel] [PATCH V4 qemu-server 5/7] ignore PVE::Storage::path errors when deleting VMs

[Stefan Hrdlicka]

Signed-off-by: Stefan Hrdlicka <s.hrdli...@proxmox.com>
---
 PVE/QemuServer.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 51e9a51..331677f 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2341,10 +2341,9 @@ sub destroy_vm {
 
                my $volid = $drive->{file};
                return if !$volid || $volid =~ m|^/|;
-
-               die "base volume '$volid' is still in use by linked cloned\n"
-                   if PVE::Storage::volume_is_base_and_used($storecfg, $volid);
-
+               my $result;
+               eval { $result = 
PVE::Storage::volume_is_base_and_used($storecfg, $volid) };
+               die "base volume '$volid' is still in use by linked cloned\n" 
if $result;
        });
     }
 
@@ -2357,7 +2356,8 @@ sub destroy_vm {
        return if !$volid || $volid =~ m|^/|;
        return if $volids->{$volid};
 
-       my ($path, $owner) = PVE::Storage::path($storecfg, $volid);
+       my ($path, $owner);
+       eval { ($path, $owner) = PVE::Storage::path($storecfg, $volid); };
        return if !$path || !$owner || ($owner != $vmid);
 
        $volids->{$volid} = 1;
-- 
2.30.2



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