From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8D261A1083 for ; Wed, 14 Jun 2023 10:46:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75CD618627 for ; Wed, 14 Jun 2023 10:46:24 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 14 Jun 2023 10:46:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 263684550A for ; Wed, 14 Jun 2023 10:46:23 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 14 Jun 2023 10:46:04 +0200 Message-Id: <20230614084622.1446211-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230614084622.1446211-1-d.csapak@proxmox.com> References: <20230614084622.1446211-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm] Subject: [pve-devel] [PATCH qemu-server v6 4/6] api: migrate preconditions: use new check_local_resources info 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: , X-List-Received-Date: Wed, 14 Jun 2023 08:46:24 -0000 for offline migration, limit the allowed nodes to the ones where the mapped resources are available this adds new info to the api call namely the 'mapped-resources' list, as well as the 'unavailable-resources' info in the 'not_allowed_nodes' object Signed-off-by: Dominik Csapak --- changes from v5: * renamed new return values with '-' instead of '_' * added 'mapped-resources' to the return value description * pulled out the $missing_mappings variable for reuse PVE/API2/Qemu.pm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 4c3c53d9..030bb272 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4317,7 +4317,11 @@ __PACKAGE__->register_method({ local_resources => { type => 'array', description => "List local resources e.g. pci, usb" - } + }, + 'mapped-resources' => { + type => 'array', + description => "List of mapped resources e.g. pci, usb" + }, }, }, code => sub { @@ -4346,7 +4350,11 @@ __PACKAGE__->register_method({ $res->{running} = PVE::QemuServer::check_running($vmid) ? 1:0; - # if vm is not running, return target nodes where local storage is available + my ($local_resources, $mapped_resources, $missing_mappings_by_node) = + PVE::QemuServer::check_local_resources($vmconf, 1); + delete $missing_mappings_by_node->{$localnode}; + + # if vm is not running, return target nodes where local storage/mapped devices are available # for offline migration if (!$res->{running}) { $res->{allowed_nodes} = []; @@ -4354,7 +4362,13 @@ __PACKAGE__->register_method({ delete $checked_nodes->{$localnode}; foreach my $node (keys %$checked_nodes) { - if (!defined $checked_nodes->{$node}->{unavailable_storages}) { + my $missing_mappings = $missing_mappings_by_node->{$node}; + if (scalar($missing_mappings->@*)) { + $checked_nodes->{$node}->{'unavailable-resources'} = $missing_mappings; + next; + } + + if (!defined($checked_nodes->{$node}->{unavailable_storages})) { push @{$res->{allowed_nodes}}, $node; } @@ -4362,13 +4376,11 @@ __PACKAGE__->register_method({ $res->{not_allowed_nodes} = $checked_nodes; } - my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid); $res->{local_disks} = [ values %$local_disks ];; - my $local_resources = PVE::QemuServer::check_local_resources($vmconf, 1); - $res->{local_resources} = $local_resources; + $res->{'mapped-resources'} = $mapped_resources; return $res; -- 2.30.2