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 67C6192051 for ; Thu, 5 Oct 2023 16:06:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4CDA219E9F for ; Thu, 5 Oct 2023 16:05:53 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 5 Oct 2023 16:05:50 +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 1782544867 for ; Thu, 5 Oct 2023 16:05:50 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 5 Oct 2023 16:05:45 +0200 Message-Id: <20231005140546.88771-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.081 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [manager.pm] Subject: [pve-devel] [PATCH ha-manager 1/2] fix #4984: recompute online usage: add service usage to migration target only if online 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: Thu, 05 Oct 2023 14:06:23 -0000 Otherwise, when using the 'basic' plugin, this would lead to autovivification of the $target node in the Perl hash tracking the usage and it would wrongly be considered online when selecting the recovery node. The 'static' plugin was not affected, because it would check and warn before adding usage to a node that was not registered with add_node() first. Doing the same in the 'basic' plugin will be done by another patch. Signed-off-by: Fiona Ebner --- src/PVE/HA/Manager.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 6a13360..d983672 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -275,7 +275,8 @@ sub recompute_online_node_usage { # count it for both, source and target as load is put on both $online_node_usage->add_service_usage_to_node($source, $sid, $source, $target) if $state ne 'request_start_balance'; - $online_node_usage->add_service_usage_to_node($target, $sid, $source, $target); + $online_node_usage->add_service_usage_to_node($target, $sid, $source, $target) + if $online_node_usage->contains_node($target); } elsif ($state eq 'stopped' || $state eq 'request_start') { # do nothing } else { -- 2.39.2