[pve-devel] [PATCH qemu-server] avoid list context for volume_size_info calls

[Fiona Ebner]

With the recent pve-storage commit d70d814 ("api: fix get content call response
type for RBD/ZFS/iSCSI volumes"), the volume_size_info call for RBD in
list context is much slower than before (from a quick test, about twice as long
without snapshots, even longer with snapshots and untested, but when using an
external cluster with image not having the fast-diff feature, it should be worse
still) and thus increases the likelihood to run into timeouts here.

None of the callers here actually need the more expensive call, so just
avoid calling in list context.

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 PVE/QemuServer.pm        | 6 +++---
 PVE/VZDump/QemuServer.pm | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index b5836f7a..c1d0fd2d 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8077,7 +8077,7 @@ sub clone_disk {
 	} else {
 	    clone_disk_check_io_uring($drive, $storecfg, $src_storeid, $storeid, $use_drive_mirror);
 
-	    ($size) = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10);
+	    $size = PVE::Storage::volume_size_info($storecfg, $drive->{file}, 10);
 	}
 	$newvolid = PVE::Storage::vdisk_alloc(
 	    $storecfg, $storeid, $newvmid, $dst_format, $name, ($size/1024)
@@ -8129,7 +8129,7 @@ sub clone_disk {
     }
 
 no_data_clone:
-    my ($size) = eval { PVE::Storage::volume_size_info($storecfg, $newvolid, 10) };
+    my $size = eval { PVE::Storage::volume_size_info($storecfg, $newvolid, 10) };
 
     my $disk = dclone($drive);
     delete $disk->{format};
@@ -8208,7 +8208,7 @@ sub create_efidisk($$$$$$$) {
     PVE::Storage::activate_volumes($storecfg, [$volid]);
 
     qemu_img_convert($ovmf_vars, $volid, $vars_size_b, undef, 0);
-    my ($size) = PVE::Storage::volume_size_info($storecfg, $volid, 3);
+    my $size = PVE::Storage::volume_size_info($storecfg, $volid, 3);
 
     return ($volid, $size/1024);
 }
diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 30baa464..add26ad6 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -119,9 +119,12 @@ sub prepare {
 	}
 	next if !$path;
 
-	my ($size, $format) = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) };
+	my $size = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) };
 	die "no such volume '$volid'\n" if $@;
 
+	my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid);
+	my $format = PVE::QemuServer::qemu_img_format($scfg, $volname);
+
 	my $diskinfo = {
 	    path => $path,
 	    volid => $volid,
-- 
2.30.2