From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9530D1FF396 for ; Thu, 6 Jun 2024 11:22:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F2B73AEE4; Thu, 6 Jun 2024 11:22:32 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 6 Jun 2024 11:22:15 +0200 Message-Id: <20240606092220.1190913-21-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240606092220.1190913-1-d.csapak@proxmox.com> References: <20240606092220.1190913-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 manager v4 2/5] bulk migrate: improve precondition checks 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" this now takes into account the 'not_allowed_nodes' hash we get from the api call. With that, we can now limit the 'local_resources' check for online vms only, as for offline guests, the 'unavailable-resources' hash already includes mapped devices that don't exist on the target node. This now also includes unavailable storages on target nodes. Signed-off-by: Dominik Csapak --- no changes PVE/API2/Nodes.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index fb4fd4d6..882d7301 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -2255,11 +2255,23 @@ my $create_migrate_worker = sub { $invalidConditions .= join(', ', map { $_->{volid} } @{$preconditions->{local_disks}}); } - if (@{$preconditions->{local_resources}}) { + if ($online && scalar($preconditions->{local_resources}->@*)) { $invalidConditions .= "\n Has local resources: "; $invalidConditions .= join(', ', @{$preconditions->{local_resources}}); } + if (my $not_allowed_nodes = $preconditions->{not_allowed_nodes}) { + if (my $unavail_storages = $not_allowed_nodes->{$target}->{unavailable_storages}) { + $invalidConditions .= "\n Has unavailable storages: "; + $invalidConditions .= join(', ', $unavail_storages->@*); + } + + if (my $unavail_resources = $not_allowed_nodes->{$target}->{'unavailable-resources'}) { + $invalidConditions .= "\n Has unavailable resources "; + $invalidConditions .= join(', ', $unavail_resources->@*); + } + } + if ($invalidConditions && $invalidConditions ne '') { print STDERR "skip VM $vmid - precondition check failed:"; die "$invalidConditions\n"; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel