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 6015E940A6 for ; Wed, 10 Apr 2024 13:04:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DF85ACD6B for ; Wed, 10 Apr 2024 13:04:08 +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:05 +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 5825043C20 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:57 +0200 Message-Id: <20240410110401.2226201-19-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 manager v2 3/5] bulk migrate: include checks for live-migratable local resources 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:11 -0000 those should be able to migrate even for online vms. If the mapping does not exist on the target node, that will be caught further down anyway. Signed-off-by: Dominik Csapak --- PVE/API2/Nodes.pm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 535facdf..56c6a4c4 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -2254,9 +2254,18 @@ my $create_migrate_worker = sub { $invalidConditions .= join(', ', map { $_->{volid} } @{$preconditions->{local_disks}}); } + # for a live migration all local_resources must be marked as live-migratable if ($online && scalar($preconditions->{local_resources}->@*)) { - $invalidConditions .= "\n Has local resources: "; - $invalidConditions .= join(', ', @{$preconditions->{local_resources}}); + my $resource_not_live = []; + for my $resource ($preconditions->{local_resources}->@*) { + next if $preconditions->{'mapped-resource-info'}->{$resource}->{'live-migration'}; + push $resource_not_live->@*, $resource; + } + + if (scalar($resource_not_live->@*)) { + $invalidConditions .= "\n Has local resources not marked as live migratable: "; + $invalidConditions .= join(', ', $resource_not_live->@*); + } } if (my $not_allowed_nodes = $preconditions->{not_allowed_nodes}) { -- 2.39.2