From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id 00AA11FF166
	for <inbox@lore.proxmox.com>; Fri, 25 Oct 2024 17:03:21 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id E3B5231CCA;
	Fri, 25 Oct 2024 17:03:02 +0200 (CEST)
From: Daniel Herzig <d.herzig@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 25 Oct 2024 17:02:34 +0200
Message-Id: <20241025150243.134466-4-d.herzig@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241025150243.134466-1-d.herzig@proxmox.com>
References: <20241025150243.134466-1-d.herzig@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results:  0
 AWL 0.029 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
 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
 Validity was blocked. See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
 information.
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
 http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
 information. [qemuserver.pm]
Subject: [pve-devel] [PATCH qemu-server 3/12] fix #4225: qemuserver: add
 function to eject isofiles
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.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