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 19BAD1FF146 for ; Tue, 20 Jan 2026 16:28:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ABD4E12FE7; Tue, 20 Jan 2026 16:28:04 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 20 Jan 2026 16:27:41 +0100 Message-ID: <20260120152755.499037-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260120152755.499037-1-d.kral@proxmox.com> References: <20260120152755.499037-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768922824921 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 Subject: [pve-devel] [PATCH ha-manager v2 09/12] config: improve variable names in read_and_check_resources_config 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Daniel Kral --- changes v1 -> v2: - new! 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 c85ec994..d01b43d8 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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel