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 v4 07/17] config: introduce separate parse_vmid_or_sid helper subroutine
Date: Wed, 18 Nov 2026 15:44:52 +0100	[thread overview]
Message-ID: <20261118144502.231134-8-d.kral@proxmox.com> (raw)
In-Reply-To: <20261118144502.231134-1-d.kral@proxmox.com>

The separate parse_vmid_or_sid() subroutine helps in stricter checking
that vmid references are only allowed in the API/CLI endpoints, while
the HA stack should always use the proper HA resource id ('type:vmid')
format internally.

This makes the parse_sid() subroutine slightly faster (by about 10%) as
it doesn't unnecessarily need to go through the vmid pattern matching.
The use of qr// was considered but increased the runtime again.

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 | 13 +++++++------
 src/PVE/CLI/ha_manager.pm    |  2 +-
 src/PVE/HA/Config.pm         | 18 ++++++++++++------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/PVE/API2/HA/Resources.pm b/src/PVE/API2/HA/Resources.pm
index a8ee5ac7..79b530e3 100644
--- a/src/PVE/API2/HA/Resources.pm
+++ b/src/PVE/API2/HA/Resources.pm
@@ -222,7 +222,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_vmid_or_sid($param->{sid});
 
         return &$api_copy_config($cfg, $sid, $exclude_group_property);
     },
@@ -246,7 +246,8 @@ __PACKAGE__->register_method({
         PVE::Cluster::check_cfs_quorum();
         mkdir("/etc/pve/ha");
 
-        my ($sid, $type, $vmid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) =
+            PVE::HA::Config::parse_vmid_or_sid(extract_param($param, 'sid'));
 
         if (my $param_type = extract_param($param, 'type')) {
             # useless, but do it anyway
@@ -301,7 +302,7 @@ __PACKAGE__->register_method({
         my $digest = extract_param($param, 'digest');
         my $delete = extract_param($param, 'delete');
 
-        my ($sid, $type) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type) = PVE::HA::Config::parse_vmid_or_sid(extract_param($param, 'sid'));
 
         if (my $param_type = extract_param($param, 'type')) {
             # useless, but do it anyway
@@ -361,7 +362,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_vmid_or_sid(extract_param($param, 'sid'));
         my $purge = extract_param($param, 'purge') // 1;
 
         if (!PVE::HA::Config::service_is_configured($sid)) {
@@ -461,7 +462,7 @@ __PACKAGE__->register_method({
 
         my $result = {};
 
-        my ($sid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid) = PVE::HA::Config::parse_vmid_or_sid(extract_param($param, 'sid'));
         my $req_node = extract_param($param, 'node');
         my $resource_type = extract_param($param, 'resource-type');
         if ($resource_type ne $type) {
@@ -585,7 +586,7 @@ __PACKAGE__->register_method({
 
         my $result = {};
 
-        my ($sid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid) = PVE::HA::Config::parse_vmid_or_sid(extract_param($param, 'sid'));
         my $req_node = extract_param($param, 'node');
 
         PVE::HA::Config::service_is_ha_managed($sid);
diff --git a/src/PVE/CLI/ha_manager.pm b/src/PVE/CLI/ha_manager.pm
index 2bec33cb..013742e0 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_vmid_or_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 25465486..2b6f33f8 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -198,22 +198,28 @@ sub update_resources_config {
 sub parse_sid {
     my ($sid) = @_;
 
-    my ($type, $vmid);
+    if (my ($type, $vmid) = $sid =~ m/^(\S+):(\S+)$/) {
+        return ($sid, $type, $vmid);
+    } else {
+        die "unable to parse service id '$sid'\n";
+    }
+}
 
-    if (($vmid) = $sid =~ m/^(\d+)$/) {
+sub parse_vmid_or_sid {
+    my ($sid) = @_;
+
+    if (my ($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);
+            my $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 $vmid does not exist\n";
         }
-    } elsif (($type, $vmid) = $sid =~ m/^(\S+):(\S+)$/) {
-        return ($sid, $type, $vmid);
     } else {
-        die "unable to parse service id '$sid'\n";
+        return parse_sid($sid);
     }
 }
 
-- 
2.47.3





  parent reply	other threads:[~2026-11-18 14:46 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 ` Daniel Kral [this message]
2026-11-18 16:02   ` [PATCH ha-manager v4 07/17] config: introduce separate parse_vmid_or_sid helper subroutine Michael Köppl
2026-11-18 14:44 ` [PATCH ha-manager v4 08/17] drop the unmodified sid return array entry value from parse_sid Daniel Kral
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-8-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