public inbox for pve-devel@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 v2 06/16] config: use early returns in parse_sid
Date: Thu, 12 Nov 2026 17:31:05 +0100	[thread overview]
Message-ID: <20261112163113.294302-9-d.kral@proxmox.com> (raw)
In-Reply-To: <20261112163113.294302-3-d.kral@proxmox.com>

While at it, also make use of the returned matches in list context by
assigning them directly to the variables instead of the special $1, $2,
... variables.

This is in preparation of an upcoming patch, which moves the conditional
vmid parsing and info-fetching branch to its separate helper subroutine.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Config.pm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index be535329..25465486 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -200,25 +200,21 @@ sub parse_sid {
 
     my ($type, $vmid);
 
-    if ($sid =~ m/^(\d+)$/) {
-        $vmid = $1;
-
+    if (($vmid) = $sid =~ m/^(\d+)$/) {
         my $vmlist = PVE::Cluster::get_vmlist();
         if (defined($vmlist->{ids}->{$vmid})) {
             my $vm_type = $vmlist->{ids}->{$vmid}->{type};
             $type = PVE::HA::Tools::get_ha_resource_type($vm_type);
             $sid = "$type:$vmid";
+            return ($sid, $type, $vmid);
         } else {
-            die "unable to detect SID from VMID - VM/CT $1 does not exist\n";
+            die "unable to detect SID from VMID - VM/CT $vmid does not exist\n";
         }
-    } elsif ($sid =~ m/^(\S+):(\S+)$/) {
-        $vmid = $2;
-        $type = $1;
+    } elsif (($type, $vmid) = $sid =~ m/^(\S+):(\S+)$/) {
+        return ($sid, $type, $vmid);
     } else {
         die "unable to parse service id '$sid'\n";
     }
-
-    return ($sid, $type, $vmid);
 }
 
 sub read_rules_config {
-- 
2.47.3





  parent reply	other threads:[~2026-11-12 16:32 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-12 16:30 [PATCH-SERIES ha-manager v2 00/16] some sid parsing and LRM speedup improvements Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 01/16] resources: remove commented ipaddr resource type Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 02/16] tree-wide: use the term vmid instead of name when referring to VMs/CTs Daniel Kral
2026-11-12 22:33   ` Thomas Lamprecht
2026-11-13 15:04     ` Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 03/16] tree-wide: remove unused return values at parse_sid callsites Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 04/16] config: make update_single_resource_config_inplace only allow sids Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 05/16] make parse_sid always return an array Daniel Kral
2026-11-12 16:31 ` Daniel Kral [this message]
2026-11-12 16:31 ` [PATCH ha-manager v2 07/16] config: introduce separate parse_vmid_or_sid helper subroutine Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 08/16] drop the unmodified sid return array entry value from parse_sid Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 09/16] lrm: rename update_lrm_status to flush_lrm_status Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 10/16] lrm: rename update_service_status to update_lrm_status Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 11/16] lrm: document and initialize LRM instance properties Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 12/16] lrm: update the service status once per work iteration Daniel Kral
2026-11-16 10:32   ` Michael Köppl
2026-11-16 12:40     ` Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 13/16] lrm: read service config " Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 14/16] lrm: compute valid service uids hash set " Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 15/16] lrm: resource_command_finished: avoid writing stale LRM results Daniel Kral
2026-11-12 16:31 ` [PATCH ha-manager v2 16/16] lrm: prune stale LRM results once per work iteration Daniel Kral
2026-11-17 18:58 ` [PATCH-SERIES ha-manager v2 00/16] some sid parsing and LRM speedup improvements Michael Köppl
2026-11-18 14:41 ` superseded: " 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=20261112163113.294302-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal