[pve-devel] [PATCH V3 qemu-server 4/6] add ignore-storage-errors for removing VM with missing storage
Stefan Hrdlicka
s.hrdlicka at proxmox.com
Tue Nov 15 11:55:24 CET 2022
Signed-off-by: Stefan Hrdlicka <s.hrdlicka at proxmox.com>
---
PVE/API2/Qemu.pm | 8 ++++++++
PVE/QemuServer.pm | 23 ++++++++++++++++-------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 30348e6..2a0806f 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -1982,6 +1982,13 @@ __PACKAGE__->register_method({
optional => 1,
default => 0,
},
+ 'ignore-storage-errors' => {
+ type => 'boolean',
+ description => 'If set, this will ignore errors when trying to remove VM'
+ . ' storage.',
+ default => 0,
+ optional => 1,
+ },
},
},
returns => {
@@ -2038,6 +2045,7 @@ __PACKAGE__->register_method({
$vmid,
$skiplock, { lock => 'destroyed' },
$purge_unreferenced,
+ $param->{'ignore-storage-errors'},
);
PVE::AccessControl::remove_vm_access($vmid);
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 51e9a51..e68d8b4 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2327,7 +2327,12 @@ sub check_type {
}
sub destroy_vm {
- my ($storecfg, $vmid, $skiplock, $replacement_conf, $purge_unreferenced) = @_;
+ my ($storecfg,
+ $vmid,
+ $skiplock,
+ $replacement_conf,
+ $purge_unreferenced,
+ $ignore_storage_errors) = @_;
my $conf = PVE::QemuConfig->load_config($vmid);
@@ -2341,10 +2346,10 @@ 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 "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors;
+ die "base volume '$volid' is still in use by linked cloned\n" if $result;
});
}
@@ -2370,7 +2375,8 @@ sub destroy_vm {
include_unused => 1,
extra_keys => ['vmstate'],
};
- PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive);
+ eval { PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive); };
+ die "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors;
for my $snap (values %{$conf->{snapshots}}) {
next if !defined($snap->{vmstate});
@@ -2379,7 +2385,10 @@ sub destroy_vm {
$remove_owned_drive->('vmstate', $drive);
}
- PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $remove_owned_drive);
+ eval {
+ PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $remove_owned_drive);
+ };
+ die "Couldn't remove one or more disks: $@\n" if $@ && !$ignore_storage_errors;
if ($purge_unreferenced) { # also remove unreferenced disk
my $vmdisks = PVE::Storage::vdisk_list($storecfg, undef, $vmid, undef, 'images');
--
2.30.2
More information about the pve-devel
mailing list