From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 926F01FF138 for ; Mon, 20 Jul 2026 14:38:19 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 8BB0E2158C; Mon, 20 Jul 2026 14:37:46 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager 09/16] drop the unmodified sid return array entry value from parse_sid Date: Mon, 20 Jul 2026 14:36:58 +0200 Message-ID: <20260720123705.216089-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260720123705.216089-1-d.kral@proxmox.com> References: <20260720123705.216089-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: 1784551006260 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.253 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_LOW -0.7 Sender listed at https://www.dnswl.org/, low trust 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: UER3XU6SGSKODPIIGME3M5JPRRKO3KYP X-Message-ID-Hash: UER3XU6SGSKODPIIGME3M5JPRRKO3KYP 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: As all callers of parse_sid() do not use the now unmodified $sid return value, remove it from the return array. It is only prepended in the case where parse_vmid_or_sid() is given a correct SID instead of a VMID. Signed-off-by: Daniel Kral --- src/PVE/HA/Config.pm | 8 ++++---- src/PVE/HA/Env/PVE2.pm | 2 +- src/PVE/HA/LRM.pm | 2 +- src/PVE/HA/Manager.pm | 4 ++-- src/PVE/HA/Sim/Env.pm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index db86de82..9e96a13a 100644 --- a/src/PVE/HA/Config.pm +++ b/src/PVE/HA/Config.pm @@ -114,7 +114,7 @@ my sub checked_resources_config { foreach my $sid (keys %{ $cfg->{ids} }) { my $d = $cfg->{ids}->{$sid}; - my (undef, undef, $vmid) = parse_sid($sid); + my (undef, $vmid) = parse_sid($sid); $d->{state} = 'started' if !defined($d->{state}); $d->{state} = 'started' if $d->{state} eq 'enabled'; # backward compatibility $d->{failback} = 1 if !defined($d->{failback}); @@ -148,7 +148,7 @@ sub read_and_check_resources_config { my sub update_single_resource_config_inplace { my ($cfg, $sid, $param, $delete) = @_; - (undef, my $type, my $vmid) = parse_sid($sid); + my ($type, $vmid) = parse_sid($sid); my $scfg = $cfg->{ids}->{$sid} || die "no such resource '$sid'\n"; @@ -199,7 +199,7 @@ sub parse_sid { my ($sid) = @_; if (my ($type, $vmid) = $sid =~ m/^(\S+):(\S+)$/) { - return ($sid, $type, $vmid); + return ($type, $vmid); } else { die "unable to parse service id '$sid'\n"; } @@ -219,7 +219,7 @@ sub parse_vmid_or_sid { die "unable to detect SID from VMID - VM/CT $1 does not exist\n"; } } else { - return parse_sid($sid); + return ($sid, parse_sid($sid)); } } diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index b91a4933..7d5b5498 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -208,7 +208,7 @@ sub exec_fence_agent { sub steal_service { my ($self, $sid, $current_node, $new_node) = @_; - my (undef, $type, $vmid) = PVE::HA::Config::parse_sid($sid); + my ($type, $vmid) = PVE::HA::Config::parse_sid($sid); if (my $plugin = PVE::HA::Resources->lookup($type)) { my $old = $plugin->config_file($vmid, $current_node); diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm index 72e37e69..afe7d6c9 100644 --- a/src/PVE/HA/LRM.pm +++ b/src/PVE/HA/LRM.pm @@ -947,7 +947,7 @@ sub exec_resource_agent { my $nodename = $haenv->nodename(); - my (undef, $service_type, $service_name) = $haenv->parse_sid($sid); + my ($service_type, $service_name) = $haenv->parse_sid($sid); my $plugin = PVE::HA::Resources->lookup($service_type); if (!$plugin) { diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index 5840a76e..12976d33 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -283,7 +283,7 @@ sub load_balance { my ($sid, $source, $target) = $migration->@{qw(sid source-node target-node)}; - my (undef, $type, $id) = $haenv->parse_sid($sid); + my ($type, $id) = $haenv->parse_sid($sid); my $task = $type eq 'vm' ? "migrate" : "relocate"; my $cmd = "$task $sid $target"; @@ -555,7 +555,7 @@ my $fence_recovery_cleanup = sub { my $haenv = $self->{haenv}; - my (undef, $type, $id) = $haenv->parse_sid($sid); + my ($type, $id) = $haenv->parse_sid($sid); my $plugin = PVE::HA::Resources->lookup($type); # should not happen diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm index 311eaad1..72f494b8 100644 --- a/src/PVE/HA/Sim/Env.pm +++ b/src/PVE/HA/Sim/Env.pm @@ -234,7 +234,7 @@ sub parse_sid { my $vmid = $2; my $type = $1; - return ($sid, $type, $vmid); + return ($type, $vmid); } sub read_fence_config { -- 2.47.3