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 A9ACEBA8A6 for ; Wed, 20 Mar 2024 13:52:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8BAA4FA4F for ; Wed, 20 Mar 2024 13:52:00 +0100 (CET) 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, 20 Mar 2024 13:51:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8621B407F4 for ; Wed, 20 Mar 2024 13:51:59 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 20 Mar 2024 13:51:55 +0100 Message-Id: <20240320125158.2094900-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240320125158.2094900-1-d.csapak@proxmox.com> References: <20240320125158.2094900-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.019 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: [pve-devel] [PATCH qemu-server 3/3] api: include not mapped resources for running vms in migrate preconditions 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, 20 Mar 2024 12:52:30 -0000 so that we can show a proper warning in the migrate dialog and check it in the bulk migrate precondition check the unavailable_storages and allowed_nodes should be the same as before Signed-off-by: Dominik Csapak --- not super happy with this partial approach, we probably should just always return the 'allowed_nodes' and 'not_allowed_nodes' and change the gui to handle the running vs not running state? PVE/API2/Qemu.pm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 8581a529..b0f155f7 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4439,7 +4439,7 @@ __PACKAGE__->register_method({ not_allowed_nodes => { type => 'object', optional => 1, - description => "List not allowed nodes with additional informations, only passed if VM is offline" + description => "List not allowed nodes with additional informations", }, local_disks => { type => 'array', @@ -4496,25 +4496,28 @@ __PACKAGE__->register_method({ # if vm is not running, return target nodes where local storage/mapped devices are available # for offline migration + my $checked_nodes = {}; + my $allowed_nodes = []; if (!$res->{running}) { - $res->{allowed_nodes} = []; - my $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg); + $checked_nodes = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg); delete $checked_nodes->{$localnode}; + } - foreach my $node (keys %$checked_nodes) { - my $missing_mappings = $missing_mappings_by_node->{$node}; - if (scalar($missing_mappings->@*)) { - $checked_nodes->{$node}->{'unavailable-resources'} = $missing_mappings; - next; - } + foreach my $node ((keys $checked_nodes->%*, keys $missing_mappings_by_node->%*)) { + my $missing_mappings = $missing_mappings_by_node->{$node}; + if (scalar($missing_mappings->@*)) { + $checked_nodes->{$node}->{'unavailable-resources'} = $missing_mappings; + next; + } + if (!$res->{running}) { if (!defined($checked_nodes->{$node}->{unavailable_storages})) { - push @{$res->{allowed_nodes}}, $node; + push $allowed_nodes->@*, $node; } - } - $res->{not_allowed_nodes} = $checked_nodes; } + $res->{not_allowed_nodes} = $checked_nodes if scalar(keys($checked_nodes->%*)) || !$res->{running}; + $res->{allowed_nodes} = $allowed_nodes if scalar($allowed_nodes->@*) || !$res->{running}; my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid); $res->{local_disks} = [ values %$local_disks ];; -- 2.39.2