public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Daniel Herzig <d.herzig@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 3/12] fix #4225: qemuserver: add function to eject isofiles
Date: Fri, 25 Oct 2024 17:02:34 +0200	[thread overview]
Message-ID: <20241025150243.134466-4-d.herzig@proxmox.com> (raw)
In-Reply-To: <20241025150243.134466-1-d.herzig@proxmox.com>

Current behaviour prevents a VM from starting, if an ISO file defined
in the configuration becomes unavailable.

The function eject_nonrequired_isos checks on whether a cdrom drive is
marked as 'required' or not. If the parameter 'required' is not
defined, it will assume 'required' to be true and keep the current
behaviour.

If 'required' is set to 0, the function 'ejects' the ISO file by
setting the drive's file value to 'none', if the underlying storage is
unavailable or if the defined file is unavailable for another reason.

The function is called while config_to_command iterates over all
volumes to allow for early storage activation and early exit in the
case of missing required files.

Signed-off-by: Daniel Herzig <d.herzig@proxmox.com>
---
 PVE/QemuServer.pm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a45bdab9..8fddff92 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3994,6 +3994,8 @@ sub config_to_command {
     PVE::QemuConfig->foreach_volume($conf, sub {
 	my ($ds, $drive) = @_;
 
+	eject_nonrequired_isos($ds, $drive, $vmid, $storecfg, $conf);
+
 	if (PVE::Storage::parse_volume_id($drive->{file}, 1)) {
 	    check_volume_storage_type($storecfg, $drive->{file});
 	    push @$vollist, $drive->{file};
@@ -8942,6 +8944,43 @@ sub delete_ifaces_ipams_ips {
     }
 }
 
+sub eject_nonrequired_isos {
+    my ($ds, $drive, $vmid, $storecfg, $conf) = @_;
+    # set 1 to exclude cloudinit. cloudinit isos are always required.
+    if (drive_is_cdrom($drive, 1)
+	&& $drive->{file} ne 'none'
+	&& $drive->{file} ne 'cdrom') {
+	$drive->{required} = 1 if !defined($drive->{required});
+	my $iso_volid = $drive->{file};
+	my $iso_path = get_iso_path($storecfg, $vmid, $drive->{file});
+	my $store_err;
+	if ($iso_volid !~ m|^/|) {
+	    my $iso_storage  = PVE::Storage::parse_volume_id($iso_volid, 1);
+	    eval { PVE::Storage::activate_storage($storecfg, $iso_storage); };
+	    $store_err = $@;
+	}
+	if ($store_err) {
+	    if ($drive->{required}) {
+		die "cannot access required file: '${ds}: ${iso_volid}': ${store_err}\n";
+	    } else {
+		log_warn("eject '${ds}: ${iso_volid}': ${store_err}");
+		$drive->{file} = 'none';
+		$conf->{$ds} = print_drive($drive);
+	    }
+	} else {
+	    if (!file_exists($iso_path)) {
+		if ($drive->{required}) {
+		    die "required file does not exist: '${ds}: ${iso_volid}'\n";
+		} else {
+		    log_warn("eject '${ds}: ${iso_volid}': file does not exist");
+		    $drive->{file} = 'none';
+		    $conf->{$ds} = print_drive($drive);
+		}
+	    }
+	}
+    }
+}
+
 sub file_exists {
     my $file_path = shift;
     return -e $file_path
-- 
2.39.5



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


  parent reply	other threads:[~2024-10-25 15:03 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-25 15:02 [pve-devel] [PATCH qemu-server, manager 0/12] bugzilla #4225 -- improve handling of unavailable ISOs Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 1/12] fix #4225: qemuserver: drive: add optional required parameter Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 2/12] qemuserver: add helper function for mocking files Daniel Herzig
2024-10-25 15:02 ` Daniel Herzig [this message]
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 4/12] test: chomp all trailing newlines from errors and warnings Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 5/12] test: mock cifs-store Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 6/12] test: add nfs-offline storage Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 7/12] test: mock existing files Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 8/12] test: mock log_warn warnings Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH qemu-server 9/12] test: cfg2cmd: add tests for testing the iso required parameter Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH manager 10/12] fix #4225: ui: form: isoselector: add optional required checkbox Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH manager 11/12] fix #4225: ui: qemu: cdedit: enable required checkbox for isos Daniel Herzig
2024-10-25 15:02 ` [pve-devel] [PATCH manager 12/12] ui: qemu: hardware: add eject button for cdroms Daniel Herzig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241025150243.134466-4-d.herzig@proxmox.com \
    --to=d.herzig@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal