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 02/17] tree-wide: use the term vmid instead of name when referring to VMs/CTs
Date: Wed, 18 Nov 2026 15:44:47 +0100	[thread overview]
Message-ID: <20261118144502.231134-3-d.kral@proxmox.com> (raw)
In-Reply-To: <20261118144502.231134-1-d.kral@proxmox.com>

The variable name $name is a bit generic when referring to the unique
identifier for VMs/CTs in code paths where only VMIDs can be expected,
so actually name it after its identifier VMID.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/API2/HA/Resources.pm  | 14 +++++++-------
 src/PVE/CLI/ha_manager.pm     |  4 ++--
 src/PVE/HA/Config.pm          | 20 ++++++++++----------
 src/PVE/HA/Env/PVE2.pm        |  6 +++---
 src/PVE/HA/Resources/PVECT.pm |  4 ++--
 src/PVE/HA/Resources/PVEVM.pm |  4 ++--
 src/PVE/HA/Sim/Env.pm         |  4 ++--
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/PVE/API2/HA/Resources.pm b/src/PVE/API2/HA/Resources.pm
index 815eb59c..a09b9d17 100644
--- a/src/PVE/API2/HA/Resources.pm
+++ b/src/PVE/API2/HA/Resources.pm
@@ -246,7 +246,7 @@ __PACKAGE__->register_method({
         PVE::Cluster::check_cfs_quorum();
         mkdir("/etc/pve/ha");
 
-        my ($sid, $type, $name) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
 
         if (my $param_type = extract_param($param, 'type')) {
             # useless, but do it anyway
@@ -257,9 +257,9 @@ __PACKAGE__->register_method({
             if defined($param->{group}) && PVE::HA::Config::have_groups_been_migrated();
 
         my $plugin = PVE::HA::Resources->lookup($type);
-        $plugin->verify_name($name);
+        $plugin->verify_name($vmid);
 
-        $plugin->exists($name);
+        $plugin->exists($vmid);
 
         my $opts = $plugin->check_config($sid, $param, 1, 1);
 
@@ -301,7 +301,7 @@ __PACKAGE__->register_method({
         my $digest = extract_param($param, 'digest');
         my $delete = extract_param($param, 'delete');
 
-        my ($sid, $type, $name) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
 
         if (my $param_type = extract_param($param, 'type')) {
             # useless, but do it anyway
@@ -361,7 +361,7 @@ __PACKAGE__->register_method({
     code => sub {
         my ($param) = @_;
 
-        my ($sid, $type, $name) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
         my $purge = extract_param($param, 'purge') // 1;
 
         if (!PVE::HA::Config::service_is_configured($sid)) {
@@ -461,7 +461,7 @@ __PACKAGE__->register_method({
 
         my $result = {};
 
-        my ($sid, $type, $name) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) = PVE::HA::Config::parse_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 +585,7 @@ __PACKAGE__->register_method({
 
         my $result = {};
 
-        my ($sid, $type, $name) = PVE::HA::Config::parse_sid(extract_param($param, 'sid'));
+        my ($sid, $type, $vmid) = PVE::HA::Config::parse_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 6625de68..2f89887f 100644
--- a/src/PVE/CLI/ha_manager.pm
+++ b/src/PVE/CLI/ha_manager.pm
@@ -193,8 +193,8 @@ our $cmddef = {
         sub {
             my $res = shift;
             foreach my $rec (sort { $a->{sid} cmp $b->{sid} } @$res) {
-                my ($type, $name) = split(':', $rec->{sid}, 2);
-                print "$type:$name\n";
+                my ($type, $vmid) = split(':', $rec->{sid}, 2);
+                print "$type:$vmid\n";
                 foreach my $k (sort keys %$rec) {
                     next
                         if $k eq 'digest'
diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index bee1ac7d..ec0551e9 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, $name) = parse_sid($sid);
+        my (undef, 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});
@@ -123,7 +123,7 @@ my sub checked_resources_config {
         $d->{max_relocate} = 1 if !defined($d->{max_relocate});
 
         if (PVE::HA::Resources->lookup($d->{type})) {
-            if (my $vmd = $vmlist->{ids}->{$name}) {
+            if (my $vmd = $vmlist->{ids}->{$vmid}) {
                 $d->{node} = $vmd->{node};
                 $resources->{$sid} = $d;
             } else {
@@ -148,7 +148,7 @@ sub read_and_check_resources_config {
 my sub update_single_resource_config_inplace {
     my ($cfg, $sid, $param, $delete) = @_;
 
-    ($sid, my $type, my $name) = parse_sid($sid);
+    ($sid, my $type, my $vmid) = parse_sid($sid);
 
     my $scfg = $cfg->{ids}->{$sid}
         || die "no such resource '$sid'\n";
@@ -198,27 +198,27 @@ sub update_resources_config {
 sub parse_sid {
     my ($sid) = @_;
 
-    my ($type, $name);
+    my ($type, $vmid);
 
     if ($sid =~ m/^(\d+)$/) {
-        $name = $1;
+        $vmid = $1;
 
         my $vmlist = PVE::Cluster::get_vmlist();
-        if (defined($vmlist->{ids}->{$name})) {
-            my $vm_type = $vmlist->{ids}->{$name}->{type};
+        if (defined($vmlist->{ids}->{$vmid})) {
+            my $vm_type = $vmlist->{ids}->{$vmid}->{type};
             $type = PVE::HA::Tools::get_ha_resource_type($vm_type);
-            $sid = "$type:$name";
+            $sid = "$type:$vmid";
         } else {
             die "unable to detect SID from VMID - VM/CT $1 does not exist\n";
         }
     } elsif ($sid =~ m/^(\S+):(\S+)$/) {
-        $name = $2;
+        $vmid = $2;
         $type = $1;
     } else {
         die "unable to parse service id '$sid'\n";
     }
 
-    return wantarray ? ($sid, $type, $name) : $sid;
+    return wantarray ? ($sid, $type, $vmid) : $sid;
 }
 
 sub read_rules_config {
diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm
index 5f195daf..f4d2b752 100644
--- a/src/PVE/HA/Env/PVE2.pm
+++ b/src/PVE/HA/Env/PVE2.pm
@@ -209,11 +209,11 @@ sub exec_fence_agent {
 sub steal_service {
     my ($self, $sid, $current_node, $new_node) = @_;
 
-    my (undef, $type, $name) = PVE::HA::Config::parse_sid($sid);
+    my (undef, $type, $vmid) = PVE::HA::Config::parse_sid($sid);
 
     if (my $plugin = PVE::HA::Resources->lookup($type)) {
-        my $old = $plugin->config_file($name, $current_node);
-        my $new = $plugin->config_file($name, $new_node);
+        my $old = $plugin->config_file($vmid, $current_node);
+        my $new = $plugin->config_file($vmid, $new_node);
         rename($old, $new)
             || die "rename '$old' to '$new' failed - $!\n";
     } else {
diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
index 3e0a9538..f00a92c9 100644
--- a/src/PVE/HA/Resources/PVECT.pm
+++ b/src/PVE/HA/Resources/PVECT.pm
@@ -38,9 +38,9 @@ sub type {
 }
 
 sub verify_name {
-    my ($class, $name) = @_;
+    my ($class, $vmid) = @_;
 
-    die "invalid VMID\n" if $name !~ m/^[1-9][0-9]+$/;
+    die "invalid VMID\n" if $vmid !~ m/^[1-9][0-9]+$/;
 }
 
 sub options {
diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
index b509457d..2ae2b55b 100644
--- a/src/PVE/HA/Resources/PVEVM.pm
+++ b/src/PVE/HA/Resources/PVEVM.pm
@@ -38,9 +38,9 @@ sub type {
 }
 
 sub verify_name {
-    my ($class, $name) = @_;
+    my ($class, $vmid) = @_;
 
-    die "invalid VMID\n" if $name !~ m/^[1-9][0-9]+$/;
+    die "invalid VMID\n" if $vmid !~ m/^[1-9][0-9]+$/;
 }
 
 sub options {
diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm
index 38ac1d03..d3c4a11d 100644
--- a/src/PVE/HA/Sim/Env.pm
+++ b/src/PVE/HA/Sim/Env.pm
@@ -231,10 +231,10 @@ sub parse_sid {
     die "unable to parse service id '$sid'\n"
         if !($sid =~ m/^(\S+):(\S+)$/);
 
-    my $name = $2;
+    my $vmid = $2;
     my $type = $1;
 
-    return wantarray ? ($sid, $type, $name) : $sid;
+    return wantarray ? ($sid, $type, $vmid) : $sid;
 }
 
 sub read_fence_config {
-- 
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 ` Daniel Kral [this message]
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 ` [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-3-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