From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 503D41FF133 for ; Mon, 11 May 2026 11:47:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8B2B7107C1; Mon, 11 May 2026 11:47:33 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v3 09/17] config: improve variable names in read_and_check_resources_config Date: Mon, 11 May 2026 11:46:30 +0200 Message-ID: <20260511094707.142930-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260511094707.142930-1-d.kral@proxmox.com> References: <20260511094707.142930-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778492723421 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.077 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 Message-ID-Hash: KFPGL6N6EOLDNM3UUTBPXWOPWUCUZFIW X-Message-ID-Hash: KFPGL6N6EOLDNM3UUTBPXWOPWUCUZFIW X-MailFrom: d.kral@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: Signed-off-by: Daniel Kral --- changes v2 -> v3: - none src/PVE/HA/Config.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index f74cb58b..8b607cf2 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -108,13 +108,13 @@ sub read_resources_config { # checks if resource exists and sets defaults for unset values sub read_and_check_resources_config { - my $res = cfs_read_file($ha_resources_config); + my $cfg = cfs_read_file($ha_resources_config); my $vmlist = PVE::Cluster::get_vmlist(); - my $conf = {}; + my $resources = {}; - foreach my $sid (keys %{ $res->{ids} }) { - my $d = $res->{ids}->{$sid}; + foreach my $sid (keys %{ $cfg->{ids} }) { + my $d = $cfg->{ids}->{$sid}; my (undef, undef, $name) = parse_sid($sid); $d->{state} = 'started' if !defined($d->{state}); $d->{state} = 'started' if $d->{state} eq 'enabled'; # backward compatibility @@ -124,17 +124,17 @@ sub read_and_check_resources_config { if (PVE::HA::Resources->lookup($d->{type})) { if (my $vmd = $vmlist->{ids}->{$name}) { $d->{node} = $vmd->{node}; - $conf->{$sid} = $d; + $resources->{$sid} = $d; } else { # undef $d->{node} is handled in get_verbose_service_state and # status API, don't spam logs or ignore it; allow to delete it! - $conf->{$sid} = $d; + $resources->{$sid} = $d; } } } # TODO PVE 10: Remove digest when HA groups have been fully migrated to rules - return wantarray ? ($conf, $res->{digest}) : $conf; + return wantarray ? ($resources, $cfg->{digest}) : $resources; } my sub update_single_resource_config_inplace { -- 2.47.3