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

[Fiona Ebner]

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 at 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;