From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Subject: Re: [pve-devel] [PATCH V4 qemu-server 5/7] ignore PVE::Storage::path errors when deleting VMs
Date: Tue, 13 Dec 2022 14:08:37 +0100 [thread overview]
Message-ID: <b6ae3497-3f5e-8f10-5db9-251ebeb93dbb@proxmox.com> (raw)
In-Reply-To: <20221125144008.2988072-6-s.hrdlicka@proxmox.com>
Some rationale in the commit message would be nice, along the lines of
"we already ignore storage errors except these, let's finish the job"
Am 25.11.22 um 15:40 schrieb Stefan Hrdlicka:
> Signed-off-by: Stefan Hrdlicka <s.hrdlicka@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) };
Same style nit as for the container patch: my $result = eval {...};
But here it's fine to not propagate the error, because
1. We already ignore storage errors by default
2. The check is done again inside vdisk_free()
It would be nice to add a comment in the code here mentioning point 2.
We could also log a warning here, but no big deal.
> + 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); };
Same style nit my ($path, $owner) = eval {...};
Should log a warning if the eval fails.
> return if !$path || !$owner || ($owner != $vmid);
>
> $volids->{$volid} = 1;
next prev parent reply other threads:[~2022-12-13 13:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 14:40 [pve-devel] [PATCH SERIES V4 pve-container/qemu-server/pve-manager 0/7] fix #3711 & adapt drive detach/remove behavior Stefan Hrdlicka
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 1/7] fix #3711: optionally allow CT deletion to complete on disk volume removal errors Stefan Hrdlicka
2022-12-13 13:07 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 2/7] adapt behavior for detaching/removing a mount point Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 3/7] add linked clone check for LXC container template deletion Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-container 4/7] cleanup: remove spaces from empty lines Stefan Hrdlicka
2022-11-25 14:40 ` [pve-devel] [PATCH V4 qemu-server 5/7] ignore PVE::Storage::path errors when deleting VMs Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner [this message]
2022-11-25 14:40 ` [pve-devel] [PATCH V4 qemu-server 6/7] adapt behavior for detaching drives to deatching container mount points Stefan Hrdlicka
2022-12-13 13:08 ` Fiona Ebner
2022-11-25 14:40 ` [pve-devel] [PATCH V4 pve-manager 7/7] 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=b6ae3497-3f5e-8f10-5db9-251ebeb93dbb@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.hrdlicka@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