[pve-devel] [PATCH qemu-server v3 2/6] fix #4225: qemuserver: introduce sub eject_nonrequired_isos

[Daniel Herzig <d.herzig@proxmox.com>]

The function `eject_nonrequired_isos` checks on whether a cdrom drive is
marked as required for booting the VM  or not. If the parameter `essential` is not
defined, it will assume `essential` 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 meant to be called from `config_to_command` while it
iterates over all volumes to allow for early storage activation and
early exit in the case of missing required files or unavailable
network storages.

This commit also adds a small helper sub `file_exists` to facilitate
mocking of file existence, which is needed for testing
`eject_nonrequired_isos` once in place.
---
 PVE/QemuServer.pm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 808c0e1c..d151c322 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8797,4 +8797,39 @@ sub delete_ifaces_ipams_ips {
     }
 }
 
+sub eject_nonrequired_isos {
+    my ($ds, $drive, $vmid, $storecfg, $conf) = @_;
+
+    # exclude cloudinit drives from processing (parameter '1')
+    return if ( !drive_is_cdrom($drive, 1) ||
+		$drive->{file} eq 'none' ||
+		$drive->{file} eq 'cdrom' );
+
+    $drive->{essential} = 1 if !defined($drive->{essential});
+    my $iso_volid = $drive->{file};
+    my $iso_path = PVE::QemuServer::Drive::get_iso_path($storecfg, $vmid, $iso_volid);
+    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 = $@;
+    }
+
+    return if ( !$store_err &&
+		file_exists($iso_path) );
+
+    if ($drive->{essential}) {
+	die "'${ds}: ${iso_volid}': storage unavailable or file does not exist\n";
+    } else {
+	log_warn("eject '${ds}: ${iso_volid}': storage unavailable or file does not exist");
+	$drive->{file} = 'none';
+	$conf->{$ds} = print_drive($drive);
+    }
+}
+
+sub file_exists {
+    my $file_path = shift;
+    return -e $file_path
+}
+
 1;
-- 
2.39.5


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