[pve-devel] [PATCH storage 1/2] pbs: free image: explicitly return undef

[pve-devel] [PATCH storage 1/2] pbs: free image: explicitly return undef

[Fabian Ebner]

Storage.pm's vdisk_free interprets truthy return values as worker subs, so be
explicit about returning undef here. Not an issue at the moment, because
run_client_command already returns undef, but better be safe than sorry.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/Storage/PBSPlugin.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm
index ae45a1a..68c702a 100644
--- a/PVE/Storage/PBSPlugin.pm
+++ b/PVE/Storage/PBSPlugin.pm
@@ -595,6 +595,8 @@ sub free_image {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     run_client_cmd($scfg, $storeid, "forget", [ $name ], 1);
+
+    return;
 }
 
 
-- 
2.20.1

[pve-devel] [PATCH storage 2/2] lvm: volume import: handle worker returned by free_image

[Fabian Ebner]

only affects LVM storages with 'saferemove 1' where the import fails at a rather
advanced stage. Previously in such cases, the renamed (by free_image) volume
del-vm-XYZ-disk-N would be left over.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/Storage/LVMPlugin.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/PVE/Storage/LVMPlugin.pm b/PVE/Storage/LVMPlugin.pm
index df49b76..b85fb89 100644
--- a/PVE/Storage/LVMPlugin.pm
+++ b/PVE/Storage/LVMPlugin.pm
@@ -670,8 +670,16 @@ sub volume_import {
 	$class->volume_import_write($fh, $file);
     };
     if (my $err = $@) {
-	eval { $class->free_image($storeid, $scfg, $volname, 0) };
+	my $cleanup_worker = eval { $class->free_image($storeid, $scfg, $volname, 0) };
 	warn $@ if $@;
+
+	if ($cleanup_worker) {
+	    my $rpcenv = PVE::RPCEnvironment::get();
+	    my $authuser = $rpcenv->get_user();
+
+	    $rpcenv->fork_worker('imgdel', undef, $authuser, $cleanup_worker);
+	}
+
 	die $err;
     }
 
-- 
2.20.1

[pve-devel] applied: [PATCH storage 2/2] lvm: volume import: handle worker returned by free_image

[Thomas Lamprecht]

On 04.05.21 11:52, Fabian Ebner wrote:
> only affects LVM storages with 'saferemove 1' where the import fails at a rather
> advanced stage. Previously in such cases, the renamed (by free_image) volume
> del-vm-XYZ-disk-N would be left over.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/Storage/LVMPlugin.pm | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
>

applied, thanks!

[pve-devel] applied: [PATCH storage 1/2] pbs: free image: explicitly return undef

[Thomas Lamprecht]

On 04.05.21 11:52, Fabian Ebner wrote:
> Storage.pm's vdisk_free interprets truthy return values as worker subs, so be
> explicit about returning undef here. Not an issue at the moment, because
> run_client_command already returns undef, but better be safe than sorry.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>  PVE/Storage/PBSPlugin.pm | 2 ++
>  1 file changed, 2 insertions(+)
> 
>

applied, thanks!