public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ha-manager 1/2] fix #4984: recompute online usage: add service usage to migration target only if online
Date: Thu,  5 Oct 2023 16:05:45 +0200	[thread overview]
Message-ID: <20231005140546.88771-1-f.ebner@proxmox.com> (raw)

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 <f.ebner@proxmox.com>
---
 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





             reply	other threads:[~2023-10-05 14:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-05 14:05 Fiona Ebner [this message]
2023-10-05 14:05 ` [pve-devel] [PATCH ha-manager 2/2] usage: basic: avoid node autovivification when adding service usage Fiona Ebner
2023-10-05 14:13 ` [pve-devel] [PATCH ha-manager 1/2] fix #4984: recompute online usage: add service usage to migration target only if online Fiona Ebner
2023-10-06 16:10 ` [pve-devel] applied-series: " Thomas Lamprecht
2023-10-09  6:45   ` Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231005140546.88771-1-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal