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 5DE52A06EC for ; Tue, 13 Jun 2023 14:46:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D47A2FE53 for ; Tue, 13 Jun 2023 14:46:21 +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, 13 Jun 2023 14:46:20 +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 79EA444ED3 for ; Tue, 13 Jun 2023 14:46:20 +0200 (CEST) Date: Tue, 13 Jun 2023 14:46:19 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pve-devel@lists.proxmox.com Message-ID: <3jdxcwn44xihj2f2c3s2j6ydrbyjs5nrw6nxgyvacqqr2jxc6s@muflhnppgpkt> References: <20230606135222.984747-1-d.csapak@proxmox.com> <20230606135222.984747-7-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230606135222.984747-7-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.126 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 - Subject: Re: [pve-devel] [PATCH qemu-server v5 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: Tue, 13 Jun 2023 12:46:21 -0000 On Tue, Jun 06, 2023 at 03:52:05PM +0200, Dominik Csapak wrote: > for offline migration, limit the allowed nodes to the ones where the > mapped resources are available > > Signed-off-by: Dominik Csapak > --- > PVE/API2/Qemu.pm | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 038bb1d4..3da08318 100644 > --- a/PVE/API2/Qemu.pm > +++ b/PVE/API2/Qemu.pm > @@ -4332,7 +4332,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, $not_allowed_nodes) = ^ as in 3/6 > + PVE::QemuServer::check_local_resources($vmconf, 1); > + delete $not_allowed_nodes->{$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} = []; > @@ -4340,7 +4344,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}->@*)) { maybe pull the node entry into a variable and reuse it below > + $checked_nodes->{$node}->{unavailable_resources} = $not_allowed_nodes->{$node}; > + next; > + } > + > + if (!defined($checked_nodes->{$node}->{unavailable_storages})) { > push @{$res->{allowed_nodes}}, $node; > } > > @@ -4348,13 +4357,11 @@ __PACKAGE__->register_method({ > $res->{not_allowed_nodes} = $checked_nodes; ^ now I'm confused > } > > - > 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