From: Daniel Kral <d.kral@proxmox.com>
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 [thread overview]
Message-ID: <20261118144502.231134-9-d.kral@proxmox.com> (raw)
In-Reply-To: <20261118144502.231134-1-d.kral@proxmox.com>
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 <d.kral@proxmox.com>
---
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
next prev parent reply other threads:[~2026-11-18 14:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 14:44 [PATCH-SERIES ha-manager v4 00/17] some sid parsing and LRM speedup improvements Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 01/17] resources: remove commented ipaddr resource type Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 02/17] tree-wide: use the term vmid instead of name when referring to VMs/CTs Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 03/17] tree-wide: remove unused return values at parse_sid callsites Daniel Kral
2026-11-18 15:20 ` Michael Köppl
2026-11-18 14:44 ` [PATCH ha-manager v4 04/17] config: make update_single_resource_config_inplace only allow sids Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 05/17] make parse_sid always return an array Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 06/17] config: use early returns in parse_sid Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 07/17] config: introduce separate parse_vmid_or_sid helper subroutine Daniel Kral
2026-11-18 16:02 ` Michael Köppl
2026-11-18 14:44 ` Daniel Kral [this message]
2026-11-18 14:44 ` [PATCH ha-manager v4 09/17] lrm: catch and report dies while the LRM is in maintenance state Daniel Kral
2026-11-18 16:12 ` Michael Köppl
2026-11-18 14:44 ` [PATCH ha-manager v4 10/17] lrm: rename update_lrm_status to flush_lrm_status Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 11/17] lrm: rename update_service_status to update_lrm_status Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 12/17] lrm: document and initialize LRM instance properties Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 13/17] lrm: update the service status once per work iteration Daniel Kral
2026-11-18 14:44 ` [PATCH ha-manager v4 14/17] lrm: read service config " Daniel Kral
2026-11-18 14:45 ` [PATCH ha-manager v4 15/17] lrm: compute valid service uids hash set " Daniel Kral
2026-11-18 14:45 ` [PATCH ha-manager v4 16/17] lrm: resource_command_finished: avoid writing stale LRM results Daniel Kral
2026-11-18 14:45 ` [PATCH ha-manager v4 17/17] lrm: prune stale LRM results once per work iteration Daniel Kral
2026-11-18 20:39 ` applied: [PATCH-SERIES ha-manager v4 00/17] some sid parsing and LRM speedup improvements Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118144502.231134-9-d.kral@proxmox.com \
--to=d.kral@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox