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 AA1431FF133 for ; Mon, 11 May 2026 17:57:51 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E1B7D1F25E; Mon, 11 May 2026 17:57:50 +0200 (CEST) From: Dominik Rusovac To: pve-devel@lists.proxmox.com Subject: [PATCH pve-ha-manager 2/3] manager: set service config value in self Date: Mon, 11 May 2026 17:57:33 +0200 Message-ID: <20260511155734.149101-3-d.rusovac@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260511155734.149101-1-d.rusovac@proxmox.com> References: <20260511155734.149101-1-d.rusovac@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778514947688 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.368 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] Message-ID-Hash: BZG6DOKQM2MQWUMSECKX3ASLU5WAJZMS X-Message-ID-Hash: BZG6DOKQM2MQWUMSECKX3ASLU5WAJZMS X-MailFrom: d.rusovac@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is in preparation for the follow-up patch. Reading the value of 'auto-rebalance'-flag in the service config of an HA resource is required to perform proper resource bundling. Signed-off-by: Dominik Rusovac --- src/PVE/HA/Manager.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index b69a6bb..2a4b31e 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -1003,6 +1003,7 @@ sub manage { $self->try_persistent_group_migration(); my ($sc, $services_digest) = $haenv->read_service_config(); + $self->{sc} = $sc; $self->{groups} = $haenv->read_group_config(); # update @@ -1011,9 +1012,9 @@ sub manage { # skip service add/remove when disarmed - handle_disarm manages service status if (!$ms->{disarm}) { # add new service - foreach my $sid (sort keys %$sc) { + foreach my $sid (sort keys $self->{sc}->%*) { next if $ss->{$sid}; # already there - my $cd = $sc->{$sid}; + my $cd = $self->{sc}->{$sid}; next if $cd->{state} eq 'ignored'; $haenv->log('info', "adding new service '$sid' on node '$cd->{node}'"); @@ -1028,9 +1029,9 @@ sub manage { # remove stale or ignored services from manager state foreach my $sid (keys %$ss) { - next if $sc->{$sid} && $sc->{$sid}->{state} ne 'ignored'; + next if $self->{sc}->{$sid} && $self->{sc}->{$sid}->{state} ne 'ignored'; - my $reason = defined($sc->{$sid}) ? 'ignored state requested' : 'no config'; + my $reason = defined($self->{sc}->{$sid}) ? 'ignored state requested' : 'no config'; $haenv->log('info', "removing stale service '$sid' ($reason)"); # remove all service related state information @@ -1088,7 +1089,7 @@ sub manage { foreach my $sid (sort keys %$ss) { next if $deferred_sids && !$deferred_sids->{$sid}; my $sd = $ss->{$sid}; - my $cd = $sc->{$sid} || { state => 'disabled' }; + my $cd = $self->{sc}->{$sid} || { state => 'disabled' }; my $lrm_res = $sd->{uid} ? $lrm_results->{ $sd->{uid} } : undef; -- 2.47.3