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 E9FAD7CC5F for ; Tue, 19 Jul 2022 13:46:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B20F628E5F for ; Tue, 19 Jul 2022 13:46:45 +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 ; Tue, 19 Jul 2022 13:46:41 +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 EB8EF42644 for ; Tue, 19 Jul 2022 13:46:40 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 19 Jul 2022 13:46:26 +0200 Message-Id: <20220719114639.3035048-11-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220719114639.3035048-1-d.csapak@proxmox.com> References: <20220719114639.3035048-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.092 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 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 6/7] PVE/API2/Qemu: 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: Tue, 19 Jul 2022 11:46:46 -0000 restrict the nodes also for mapped devices, and return them in their own property Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index a8029c2..72c8755 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4158,6 +4158,10 @@ __PACKAGE__->register_method({ $res->{running} = PVE::QemuServer::check_running($vmid) ? 1:0; + my ($local_resources, $mapped_resources, $not_allowed_nodes) = + PVE::QemuServer::check_local_resources($vmconf, 1); + delete $not_allowed_nodes->{$localnode}; + # if vm is not running, return target nodes where local storage is available # for offline migration if (!$res->{running}) { @@ -4166,7 +4170,12 @@ __PACKAGE__->register_method({ delete $checked_nodes->{$localnode}; foreach my $node (keys %$checked_nodes) { - if (!defined $checked_nodes->{$node}->{unavailable_storages}) { + if (scalar(@{$not_allowed_nodes->{$node}})) { + $checked_nodes->{$node}->{unavailable_resources} = $not_allowed_nodes->{$node}; + next; + } + + if (!defined($checked_nodes->{$node}->{unavailable_storages})) { push @{$res->{allowed_nodes}}, $node; } @@ -4174,13 +4183,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