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 0460B940D5 for ; Wed, 10 Apr 2024 13:04:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 407B9CDAF for ; Wed, 10 Apr 2024 13:04:10 +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, 10 Apr 2024 13:04:08 +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 CBD0C43C98 for ; Wed, 10 Apr 2024 13:04:05 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 10 Apr 2024 13:03:54 +0200 Message-Id: <20240410110401.2226201-16-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com> References: <20240410110401.2226201-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 Subject: [pve-devel] [PATCH qemu-server v2 10/10] 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, 10 Apr 2024 11:04:13 -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 should be the same as before, but we now always return allowed_nodes too. also add a note that we want to redesign the return values here, to make * the api call simpler * return better structured values Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 286355bd..5372ba75 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4428,18 +4428,20 @@ __PACKAGE__->register_method({ }, }, returns => { + # TODO 9.x: rework the api call to return more sensible structures + # e.g. a simple list of nodes with their blockers and/or notices to show type => "object", properties => { running => { type => 'boolean' }, allowed_nodes => { type => 'array', optional => 1, - description => "List nodes allowed for offline migration, only passed if VM is offline" + description => "List nodes allowed for offline migration.", }, 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 information.", }, local_disks => { type => 'array', @@ -4496,28 +4498,31 @@ __PACKAGE__->register_method({ # if vm is not running, return target nodes where local storage/mapped devices are available # for offline migration + $res->{allowed_nodes} = []; + $res->{not_allowed_nodes} = {}; if (!$res->{running}) { - $res->{allowed_nodes} = []; - my $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; - } + $res->{not_allowed_nodes} = PVE::QemuServer::check_local_storage_availability($vmconf, $storecfg); + delete $res->{not_allowed_nodes}->{$localnode}; + } - if (!defined($checked_nodes->{$node}->{unavailable_storages})) { - push @{$res->{allowed_nodes}}, $node; - } + my $merged = { $res->{not_allowed_nodes}->%*, $missing_mappings_by_node->%* }; + for my $node (keys $merged->%*) { + my $missing_mappings = $missing_mappings_by_node->{$node}; + if (scalar($missing_mappings->@*)) { + $res->{not_allowed_nodes}->{$node}->{'unavailable-resources'} = $missing_mappings; + next; + } + + if (!$res->{running}) { + if (!defined($res->{not_allowed_nodes}->{$node}->{unavailable_storages})) { + push $res->{allowed_nodes}->@*, $node; + } } - $res->{not_allowed_nodes} = $checked_nodes; } my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid); - $res->{local_disks} = [ values %$local_disks ];; + $res->{local_disks} = [ values %$local_disks ]; $res->{local_resources} = $local_resources; $res->{'mapped-resources'} = [ keys $mapped_resources->%* ]; -- 2.39.2