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 B3C691FF133 for ; Mon, 11 May 2026 11:47:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 34BEA10699; Mon, 11 May 2026 11:47:32 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v3 10/17] config: factor out checked_resources_config helper Date: Mon, 11 May 2026 11:46:31 +0200 Message-ID: <20260511094707.142930-11-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: 1778492723476 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: EU4M6LIC2DYFHVBHWJQFQFZG465DGRCK X-Message-ID-Hash: EU4M6LIC2DYFHVBHWJQFQFZG465DGRCK 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: This allows future users to retrieve the checked resource config if these already have a parsed resource config instead of reading it twice. Signed-off-by: Daniel Kral --- changes v2 -> v3: - none src/PVE/HA/Config.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index 8b607cf2..d78f7179 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -105,10 +105,9 @@ sub read_resources_config { return cfs_read_file($ha_resources_config); } -# checks if resource exists and sets defaults for unset values -sub read_and_check_resources_config { - - my $cfg = cfs_read_file($ha_resources_config); +# returns resources config with defaults and node placement set +my sub checked_resources_config { + my ($cfg) = @_; my $vmlist = PVE::Cluster::get_vmlist(); my $resources = {}; @@ -137,6 +136,13 @@ sub read_and_check_resources_config { return wantarray ? ($resources, $cfg->{digest}) : $resources; } +# checks if resource exists and sets defaults for unset values +sub read_and_check_resources_config { + my $cfg = cfs_read_file($ha_resources_config); + + return checked_resources_config($cfg); +} + my sub update_single_resource_config_inplace { my ($cfg, $sid, $param, $delete) = @_; -- 2.47.3