[pve-devel] [RFC qemu-server 6/9] cloudinit: add check if storage for cloudinit disk supports vm images

[Daniel Kral <d.kral@proxmox.com>]

Adds a check when a cloudinit disk is created or committed if the
underlying storage supports the content type 'images'. The check will be
done right before allocating the disk image.

This has not been done before, but as the cloudinit disk is recognized
as a disk image in itself, this check should be done to stay consistent.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
I am unsure about these changes as this aligns with the consistency that
disk images should only be allocated on storages that support them, but
this case has not caused the VM to fail to run before.

Are there downsides to adding this? How many people will have VMs that
have a now misconfigured VM as the PVE WebGUI doesn't show any storages
without the content type 'images'.

 PVE/API2/Qemu.pm            | 2 +-
 PVE/QemuServer/Cloudinit.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index b6bfd68e..a0abe44f 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -391,7 +391,7 @@ my sub create_disks : prototype($$$$$$$$$$) {
 
 	    # Initial disk created with 4 MB and aligned to 4MB on regeneration
 	    my $ci_size = PVE::QemuServer::Cloudinit::CLOUDINIT_DISK_SIZE;
-	    my $volid = PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $fmt, $name, $ci_size/1024);
+	    my $volid = alloc_volume_disk($storecfg, $storeid, $vmid, $fmt, $name, $ci_size/1024);
 	    $disk->{file} = $volid;
 	    $disk->{media} = 'cdrom';
 	    push @$vollist, $volid;
diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm
index 4efbdf53..573dd870 100644
--- a/PVE/QemuServer/Cloudinit.pm
+++ b/PVE/QemuServer/Cloudinit.pm
@@ -13,7 +13,7 @@ use JSON;
 use PVE::Tools qw(run_command file_set_contents);
 use PVE::Storage;
 use PVE::QemuServer;
-use PVE::QemuServer::Helpers;
+use PVE::QemuServer::Helpers qw(alloc_volume_disk);
 
 use constant CLOUDINIT_DISK_SIZE => 4 * 1024 * 1024; # 4MiB in bytes
 
@@ -43,7 +43,7 @@ sub commit_cloudinit_disk {
 	$volname =~ m/(vm-$vmid-cloudinit(.\Q$format\E)?)/;
 	my $name = $1;
 	$size = 4 * 1024;
-	PVE::Storage::vdisk_alloc($storecfg, $storeid, $vmid, $format, $name, $size);
+	alloc_volume_disk($storecfg, $storeid, $vmid, $format, $name, $size);
 	$size *= 1024; # vdisk alloc takes KB, qemu-img dd's osize takes byte
     }
     my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel