[pve-devel] [PATCH ha-manager 01/13] Make parameters for LRM resource commands more flexible

[Fabian Ebner]

This will allow for new parameters beside 'target' to be used.
This is in preparation to allow for a 'timeout' parameter for a new 'stop' 
command.

Signed-off-by: Fabian Ebner <f.eb...@proxmox.com>
---
 src/PVE/HA/LRM.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index af4e21e..3b4a572 100644
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -477,7 +477,7 @@ sub run_workers {
                        # do work
                        my $res = -1;
                        eval {
-                           $res = $self->exec_resource_agent($sid, 
$sc->{$sid}, $w->{state}, $w->{target});
+                           $res = $self->exec_resource_agent($sid, 
$sc->{$sid}, $w->{state}, $w->{params});
                        };
                        if (my $err = $@) {
                            $haenv->log('err', $err);
@@ -491,7 +491,7 @@ sub run_workers {
                } else {
                    my $res = -1;
                    eval {
-                       $res = $self->exec_resource_agent($sid, $sc->{$sid}, 
$w->{state}, $w->{target});
+                       $res = $self->exec_resource_agent($sid, $sc->{$sid}, 
$w->{state}, $w->{params});
                        $res = $res << 8 if $res > 0;
                    };
                    if (my $err = $@) {
@@ -535,14 +535,14 @@ sub manage_resources {
        my $req_state = $sd->{state};
        next if !defined($req_state);
        next if $req_state eq 'freeze';
-       $self->queue_resource_command($sid, $sd->{uid}, $req_state, 
$sd->{target});
+       $self->queue_resource_command($sid, $sd->{uid}, $req_state, {'target' 
=> $sd->{target}});
     }
 
     return $self->run_workers();
 }
 
 sub queue_resource_command {
-    my ($self, $sid, $uid, $state, $target) = @_;
+    my ($self, $sid, $uid, $state, $params) = @_;
 
     # do not queue the excatly same command twice as this may lead to
     # an inconsistent HA state when the first command fails but the CRM
@@ -564,7 +564,7 @@ sub queue_resource_command {
        state => $state,
     };
 
-    $self->{workers}->{$sid}->{target} = $target if $target;
+    $self->{workers}->{$sid}->{params} = $params if $params;
 }
 
 sub check_active_workers {
@@ -711,7 +711,7 @@ sub handle_service_exitcode {
 }
 
 sub exec_resource_agent {
-    my ($self, $sid, $service_config, $cmd, @params) = @_;
+    my ($self, $sid, $service_config, $cmd, $params) = @_;
 
     # setup execution environment
 
@@ -790,7 +790,7 @@ sub exec_resource_agent {
 
     } elsif ($cmd eq 'migrate' || $cmd eq 'relocate') {
 
-       my $target = $params[0];
+       my $target = $params->{target};
        if (!defined($target)) {
            die "$cmd '$sid' failed - missing target\n" if !defined($target);
            return EINVALID_PARAMETER;
-- 
2.20.1


_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel