[PATCH ha-manager v4 05/27] manager: factor out helper to check if requested resource motion is valid

[Fiona Ebner <f.ebner@proxmox.com>]

Avoids some duplication. No functional change is intended.

Suggested-by: Daniel Kral <d.kral@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Changes in v4:
* Split into its own patch and also use for CRM check.

 src/PVE/HA/Manager.pm | 55 +++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index 0aef118..b5da4b7 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -666,6 +666,24 @@ sub any_resource_motion_queued_or_running {
     return 0;
 }
 
+my sub check_resource_motion_valid {
+    my ($self, $target, $sd, $logprefix) = @_;
+
+    my ($haenv, $ns) = $self->@{qw(haenv ns)};
+
+    if (!$ns->node_is_online($target)) {
+        $haenv->log('err', "$logprefix - node '$target' not online");
+        return 0;
+    }
+
+    if ($target eq $sd->{node}) {
+        $haenv->log('info', "$logprefix - service already on node '$target'");
+        return 0;
+    }
+
+    return 1;
+}
+
 # read new crm commands and save them into crm master status
 sub update_crm_commands {
     my ($self) = @_;
@@ -680,17 +698,8 @@ sub update_crm_commands {
         if ($cmd =~ m/^(migrate|relocate)\s+(\S+)\s+(\S+)$/) {
             my ($task, $sid, $node) = ($1, $2, $3);
             if (my $sd = $ss->{$sid}) {
-                if (!$ns->node_is_online($node)) {
-                    $haenv->log('err', "ignore crm command '$cmd' - node '$node' not online");
-                } else {
-                    if ($node eq $sd->{node}) {
-                        $haenv->log(
-                            'info',
-                            "ignore crm command '$cmd' - service already on node '$node'",
-                        );
-                    } else {
-                        $self->queue_resource_motion($cmd, $task, $sid, $node);
-                    }
+                if (check_resource_motion_valid($self, $node, $sd, "ignore crm command '$cmd'")) {
+                    $self->queue_resource_motion($cmd, $task, $sid, $node);
                 }
             } else {
                 $haenv->log('err', "crm command error - no such service: $cmd");
@@ -1308,15 +1317,8 @@ sub next_state_stopped {
 
         if ($cmd eq 'migrate' || $cmd eq 'relocate') {
             my $target = shift @{ $sd->{cmd} };
-            if (!$ns->node_is_online($target)) {
-                $haenv->log('err',
-                    "ignore service '$sid' $cmd request - node '$target' not online");
-            } elsif ($sd->{node} eq $target) {
-                $haenv->log(
-                    'info',
-                    "ignore service '$sid' $cmd request - service already on node '$target'",
-                );
-            } else {
+            my $logprefix = "ignore service '$sid' $cmd request";
+            if (check_resource_motion_valid($self, $target, $sd, $logprefix)) {
                 &$change_service_state($self, $sid, $cmd, node => $sd->{node}, target => $target);
                 return;
             }
@@ -1432,17 +1434,8 @@ sub next_state_started {
 
             if ($cmd eq 'migrate' || $cmd eq 'relocate') {
                 my $target = shift @{ $sd->{cmd} };
-                if (!$ns->node_is_online($target)) {
-                    $haenv->log(
-                        'err',
-                        "ignore service '$sid' $cmd request - node '$target' not online",
-                    );
-                } elsif ($sd->{node} eq $target) {
-                    $haenv->log(
-                        'info',
-                        "ignore service '$sid' $cmd request - service already on node '$target'",
-                    );
-                } else {
+                my $logprefix = "ignore service '$sid' $cmd request";
+                if (check_resource_motion_valid($self, $target, $sd, $logprefix)) {
                     $haenv->log('info', "$cmd service '$sid' to node '$target'");
                     &$change_service_state(
                         $self, $sid, $cmd,
-- 
2.47.3