From: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH V3 qemu-server 4/6] add ignore-storage-errors for removing VM with missing storage
Date: Tue, 15 Nov 2022 11:55:24 +0100 [thread overview]
Message-ID: <20221115105526.3428334-5-s.hrdlicka@proxmox.com> (raw)
In-Reply-To: <20221115105526.3428334-1-s.hrdlicka@proxmox.com>
Signed-off-by: Stefan Hrdlicka <s.hrdlicka@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
next prev parent reply other threads:[~2022-11-15 10:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 10:55 [pve-devel] [PATCH SERIES V3 pve-container/qemu-server/pve-manager 0/6] fix #3711 & adapt drive detach/remove behavior Stefan Hrdlicka
2022-11-15 10:55 ` [pve-devel] [PATCH V3 pve-container 1/6] fix #3711: optionally allow CT deletion to complete on disk volume removal errors Stefan Hrdlicka
2022-11-15 10:55 ` [pve-devel] [PATCH V3 pve-container 2/6] adapt behavior for detaching/removing a mount point Stefan Hrdlicka
2022-11-15 10:55 ` [pve-devel] [PATCH V3 pve-container 3/6] cleanup: remove spaces from empty lines Stefan Hrdlicka
2022-11-15 10:55 ` Stefan Hrdlicka [this message]
2022-11-15 12:17 ` [pve-devel] [PATCH V3 qemu-server 4/6] add ignore-storage-errors for removing VM with missing storage Fiona Ebner
2022-11-15 14:22 ` Stefan Hrdlicka
2022-11-16 10:08 ` Fiona Ebner
2022-11-15 10:55 ` [pve-devel] [PATCH V3 qemu-server 5/6] adapt behavior for detaching drives to deatching container mount points Stefan Hrdlicka
2022-11-15 10:55 ` [pve-devel] [PATCH V3 pve-manager 6/6] fix #3711: optionally allow CT deletion to complete on disk volume removal errors Stefan Hrdlicka
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=20221115105526.3428334-5-s.hrdlicka@proxmox.com \
--to=s.hrdlicka@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox