From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ha-manager 2/2] usage: basic: avoid node autovivification when adding service usage
Date: Thu, 5 Oct 2023 16:05:46 +0200 [thread overview]
Message-ID: <20231005140546.88771-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20231005140546.88771-1-f.ebner@proxmox.com>
Part of what caused bug #4984. Make the code future-proof and warn
when the node was never registered in the plugin, similar to what the
'static' usage plugin already does.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
src/PVE/HA/Usage/Basic.pm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/PVE/HA/Usage/Basic.pm b/src/PVE/HA/Usage/Basic.pm
index f066350..d6b3d6c 100644
--- a/src/PVE/HA/Usage/Basic.pm
+++ b/src/PVE/HA/Usage/Basic.pm
@@ -10,6 +10,7 @@ sub new {
return bless {
nodes => {},
+ haenv => $haenv,
}, $class;
}
@@ -40,7 +41,14 @@ sub contains_node {
sub add_service_usage_to_node {
my ($self, $nodename, $sid, $service_node, $migration_target) = @_;
- $self->{nodes}->{$nodename}++;
+ if ($self->contains_node($nodename)) {
+ $self->{nodes}->{$nodename}++;
+ } else {
+ $self->{haenv}->log(
+ 'warning',
+ "unable to add service '$sid' usage to node '$nodename' - node not in usage hash",
+ );
+ }
}
sub score_nodes_to_start_service {
--
2.39.2
next prev parent reply other threads:[~2023-10-05 14:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-05 14:05 [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-05 14:05 ` Fiona Ebner [this message]
2023-10-05 14:13 ` 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-2-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