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 D0E3A1FF0C0 for ; Wed, 18 Nov 2026 15:47:09 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id F3A3D21984; Wed, 18 Nov 2026 15:45:30 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 08/17] drop the unmodified sid return array entry value from parse_sid Date: Wed, 18 Nov 2026 15:44:53 +0100 Message-ID: <20261118144502.231134-9-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118144502.231134-1-d.kral@proxmox.com> References: <20261118144502.231134-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: 1795013119136 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.457 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_MED -2.3 Sender listed at https://www.dnswl.org/, medium 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: DVCEJRQWC65HUHBKKWZDUTNHDSH2DUHV X-Message-ID-Hash: DVCEJRQWC65HUHBKKWZDUTNHDSH2DUHV 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 no caller of parse_sid() uses 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/API2/HA/Resources.pm | 2 +- src/PVE/HA/Config.pm | 8 ++++---- src/PVE/HA/Env/PVE2.pm | 2 +- src/PVE/HA/LRM.pm | 2 +- src/PVE/HA/Manager.pm | 6 +++--- src/PVE/HA/Sim/Env.pm | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/PVE/API2/HA/Resources.pm b/src/PVE/API2/HA/Resources.pm index 79b530e3..b9b50912 100644 --- a/src/PVE/API2/HA/Resources.pm +++ b/src/PVE/API2/HA/Resources.pm @@ -406,7 +406,7 @@ __PACKAGE__->register_method({ }, resolve_type => sub { my ($param) = @_; - my $type = (PVE::HA::Config::parse_sid($param->{sid}))[1]; + my ($type) = PVE::HA::Config::parse_sid($param->{sid}); if (!($type eq 'ct' || $type eq 'vm')) { die "Unknown service type '$type' for 'migrate' endpoint schema.\n"; } diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm index 2b6f33f8..f34c8c3a 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) = parse_sid($sid); + my ($type) = 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 $vmid 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 f4d2b752..162c0249 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -209,7 +209,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 b87db7bd..ff3400e4 100644 --- a/src/PVE/HA/LRM.pm +++ b/src/PVE/HA/LRM.pm @@ -950,7 +950,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 ab574f23..6173d341 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -285,7 +285,7 @@ sub load_balance { my ($sid, $source, $target) = $migration->@{qw(sid source-node target-node)}; - my (undef, $type) = $haenv->parse_sid($sid); + my ($type) = $haenv->parse_sid($sid); my $task = $type eq 'vm' ? "migrate" : "relocate"; my $cmd = "$task $sid $target"; @@ -561,7 +561,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 @@ -667,7 +667,7 @@ sub queue_resource_motion { next if $ss->{$csid}->{node} && $ss->{$csid}->{node} eq $target; next if $ss->{$csid}->{target} && $ss->{$csid}->{target} eq $target; - my $type = ($haenv->parse_sid($csid))[1]; + my ($type) = $haenv->parse_sid($csid); my $applicable_migrate_options = $migrate_options_for_type->($type); $haenv->log( 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