all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH ha-manager v3 05/17] make parse_sid always return an array
Date: Wed, 18 Nov 2026 15:25:44 +0100	[thread overview]
Message-ID: <20261118142556.218589-6-d.kral@proxmox.com> (raw)
In-Reply-To: <20261118142556.218589-1-d.kral@proxmox.com>

parse_sid() is only called within the pve-ha-manager package and there
are only two callers, which only need the $sid return value.

In preparation of the changes in the following patches and reduce the
clutter introduced by a wantarray, always return an array and adapt its
callers as $sid is already the first value in the returned array.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
 src/PVE/API2/HA/Resources.pm | 2 +-
 src/PVE/CLI/ha_manager.pm    | 2 +-
 src/PVE/HA/Config.pm         | 2 +-
 src/PVE/HA/Sim/Env.pm        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PVE/API2/HA/Resources.pm b/src/PVE/API2/HA/Resources.pm
index 5c2b4551..a1fa8856 100644
--- a/src/PVE/API2/HA/Resources.pm
+++ b/src/PVE/API2/HA/Resources.pm
@@ -174,7 +174,7 @@ __PACKAGE__->register_method({
         my $cfg = PVE::HA::Config::read_resources_config();
         my $exclude_group_property = PVE::HA::Config::have_groups_been_migrated();
 
-        my $sid = PVE::HA::Config::parse_sid($param->{sid});
+        my ($sid) = PVE::HA::Config::parse_sid($param->{sid});
 
         return &$api_copy_config($cfg, $sid, $exclude_group_property);
     },
diff --git a/src/PVE/CLI/ha_manager.pm b/src/PVE/CLI/ha_manager.pm
index 2f89887f..2bec33cb 100644
--- a/src/PVE/CLI/ha_manager.pm
+++ b/src/PVE/CLI/ha_manager.pm
@@ -104,7 +104,7 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my $sid = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
 
         PVE::HA::Config::service_is_ha_managed($sid);
 
diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index 07290eee..be535329 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -218,7 +218,7 @@ sub parse_sid {
         die "unable to parse service id '$sid'\n";
     }
 
-    return wantarray ? ($sid, $type, $vmid) : $sid;
+    return ($sid, $type, $vmid);
 }
 
 sub read_rules_config {
diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm
index d3c4a11d..311eaad1 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 wantarray ? ($sid, $type, $vmid) : $sid;
+    return ($sid, $type, $vmid);
 }
 
 sub read_fence_config {
-- 
2.47.3





  parent reply	other threads:[~2026-11-18 14:26 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 14:25 [PATCH-SERIES ha-manager v3 00/17] some sid parsing and LRM speedup improvements Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 01/17] resources: remove commented ipaddr resource type Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 02/17] tree-wide: use the term vmid instead of name when referring to VMs/CTs Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 03/17] tree-wide: remove unused return values at parse_sid callsites Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 04/17] config: make update_single_resource_config_inplace only allow sids Daniel Kral
2026-11-18 14:25 ` Daniel Kral [this message]
2026-11-18 14:25 ` [PATCH ha-manager v3 06/17] config: use early returns in parse_sid Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 07/17] config: introduce separate parse_vmid_or_sid helper subroutine Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 08/17] drop the unmodified sid return array entry value from parse_sid Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 09/17] lrm: catch and report dies while the LRM is in maintenance state Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 10/17] lrm: rename update_lrm_status to flush_lrm_status Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 11/17] lrm: rename update_service_status to update_lrm_status Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 12/17] lrm: document and initialize LRM instance properties Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 13/17] lrm: update the service status once per work iteration Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 14/17] lrm: read service config " Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 15/17] lrm: compute valid service uids hash set " Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 16/17] lrm: resource_command_finished: avoid writing stale LRM results Daniel Kral
2026-11-18 14:25 ` [PATCH ha-manager v3 17/17] lrm: prune stale LRM results once per work iteration Daniel Kral
2026-11-18 14:46 ` superseded: [PATCH-SERIES ha-manager v3 00/17] some sid parsing and LRM speedup improvements Daniel Kral

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=20261118142556.218589-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal