From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 866851FF16B for ; Mon, 16 Sep 2024 18:39:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7FF03B96B; Mon, 16 Sep 2024 18:39:17 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Mon, 16 Sep 2024 18:38:36 +0200 Message-Id: <20240916163839.236908-7-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20240916163839.236908-1-d.kral@proxmox.com> References: <20240916163839.236908-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC qemu-server 6/9] cloudinit: add check if storage for cloudinit disk supports vm images X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- 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