[PATCH ha-manager 09/16] drop the unmodified sid return array entry value from parse_sid

[Daniel Kral <d.kral@proxmox.com>]

As all callers of parse_sid() do not use 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/HA/Config.pm   | 8 ++++----
 src/PVE/HA/Env/PVE2.pm | 2 +-
 src/PVE/HA/LRM.pm      | 2 +-
 src/PVE/HA/Manager.pm  | 4 ++--
 src/PVE/HA/Sim/Env.pm  | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index db86de82..9e96a13a 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, my $vmid) = parse_sid($sid);
+    my ($type, $vmid) = 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 $1 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 b91a4933..7d5b5498 100644
--- a/src/PVE/HA/Env/PVE2.pm
+++ b/src/PVE/HA/Env/PVE2.pm
@@ -208,7 +208,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 72e37e69..afe7d6c9 100644
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -947,7 +947,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 5840a76e..12976d33 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -283,7 +283,7 @@ sub load_balance {
 
     my ($sid, $source, $target) = $migration->@{qw(sid source-node target-node)};
 
-    my (undef, $type, $id) = $haenv->parse_sid($sid);
+    my ($type, $id) = $haenv->parse_sid($sid);
     my $task = $type eq 'vm' ? "migrate" : "relocate";
     my $cmd = "$task $sid $target";
 
@@ -555,7 +555,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
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