[PATCH ha-manager v4 08/27] lrm: resource migration: support extra migration options

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

The options will be passed from the guest API endpoints through the HA
stack, all the way to the resource plugins.

In a following commit, the resource plugins will forward parts of the
schema of the resource-specific migration endpoint to the HA resource
endpoint. In particular, forwarding the 'with-conntrack-state' option
will be used to fix bug #7053.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Changes in v4:
* Make tidy.
* Always apply migrate-options to $params hash like is done for other
  params too.
* Avoid unnecessary sort.
* Also pass migrate options along in simulated plugins.

 src/PVE/HA/LRM.pm                    | 16 ++++++++--------
 src/PVE/HA/Resources.pm              |  2 +-
 src/PVE/HA/Resources/PVECT.pm        |  5 ++++-
 src/PVE/HA/Resources/PVEVM.pm        |  5 ++++-
 src/PVE/HA/Sim/Resources.pm          |  2 +-
 src/PVE/HA/Sim/Resources/VirtCT.pm   |  5 ++---
 src/PVE/HA/Sim/Resources/VirtFail.pm |  6 +++---
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index 72e37e6..4aec85b 100644
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -749,14 +749,14 @@ sub manage_resources {
         # intermediate step for optional better node selection on stop -> start request state change
         next if $request_state eq 'request_start';
 
+        my $params = {
+            'migrate-options' => $sd->{'migrate-options'},
+            'target' => $sd->{target},
+            'timeout' => $sd->{timeout},
+        };
+
         $self->queue_resource_command(
-            $sid,
-            $sd->{uid},
-            $request_state,
-            {
-                'target' => $sd->{target},
-                'timeout' => $sd->{timeout},
-            },
+            $sid, $sd->{uid}, $request_state, $params,
         );
     }
 
@@ -1040,7 +1040,7 @@ sub exec_resource_agent {
 
         my $online = ($cmd eq 'migrate') ? 1 : 0;
 
-        my $res = $plugin->migrate($haenv, $id, $target, $online);
+        my $res = $plugin->migrate($haenv, $id, $target, $online, $params->{'migrate-options'});
 
         # something went wrong if service is still on this node
         if (!$res) {
diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm
index df7c1ff..656cb19 100644
--- a/src/PVE/HA/Resources.pm
+++ b/src/PVE/HA/Resources.pm
@@ -154,7 +154,7 @@ sub shutdown {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     die "implement in subclass";
 }
diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
index 177b907..a8fe42e 100644
--- a/src/PVE/HA/Resources/PVECT.pm
+++ b/src/PVE/HA/Resources/PVECT.pm
@@ -106,7 +106,7 @@ sub shutdown {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     my $nodename = $haenv->nodename();
 
@@ -117,6 +117,9 @@ sub migrate {
         online => 0, # we cannot migrate CT (yet) online, only relocate
     };
 
+    $migrate_options //= {};
+    $params->{$_} = $migrate_options->{$_} for keys $migrate_options->%*;
+
     # always relocate container for now
     if ($class->check_running($haenv, $id)) {
         $class->shutdown($haenv, $id);
diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
index 8753271..3b61113 100644
--- a/src/PVE/HA/Resources/PVEVM.pm
+++ b/src/PVE/HA/Resources/PVEVM.pm
@@ -107,7 +107,7 @@ sub shutdown {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     my $nodename = $haenv->nodename();
 
@@ -123,6 +123,9 @@ sub migrate {
         online => $online,
     };
 
+    $migrate_options //= {};
+    $params->{$_} = $migrate_options->{$_} for keys $migrate_options->%*;
+
     # explicitly shutdown if $online isn't true (relocate)
     if (!$online && $class->check_running($haenv, $id)) {
         $class->shutdown($haenv, $id);
diff --git a/src/PVE/HA/Sim/Resources.pm b/src/PVE/HA/Sim/Resources.pm
index 9b2f3b6..a464c62 100644
--- a/src/PVE/HA/Sim/Resources.pm
+++ b/src/PVE/HA/Sim/Resources.pm
@@ -88,7 +88,7 @@ sub check_running {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     my $sid = $class->type() . ":$id";
     my $nodename = $haenv->nodename();
diff --git a/src/PVE/HA/Sim/Resources/VirtCT.pm b/src/PVE/HA/Sim/Resources/VirtCT.pm
index 3f6df85..ecf3af4 100644
--- a/src/PVE/HA/Sim/Resources/VirtCT.pm
+++ b/src/PVE/HA/Sim/Resources/VirtCT.pm
@@ -17,7 +17,7 @@ sub exists {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     my $sid = "ct:$id";
     my $nodename = $haenv->nodename();
@@ -29,8 +29,7 @@ sub migrate {
         $online = 0;
     }
 
-    return $class->SUPER::migrate($haenv, $id, $target, $online);
-
+    return $class->SUPER::migrate($haenv, $id, $target, $online, $migrate_options);
 }
 
 1;
diff --git a/src/PVE/HA/Sim/Resources/VirtFail.pm b/src/PVE/HA/Sim/Resources/VirtFail.pm
index ea7a87a..9eb86b4 100644
--- a/src/PVE/HA/Sim/Resources/VirtFail.pm
+++ b/src/PVE/HA/Sim/Resources/VirtFail.pm
@@ -84,7 +84,7 @@ sub shutdown {
 }
 
 sub migrate {
-    my ($class, $haenv, $id, $target, $online) = @_;
+    my ($class, $haenv, $id, $target, $online, $migrate_options) = @_;
 
     my ($migrate_failure_count, $limit_to_node) = ($decode_id->($id))[1, 4];
 
@@ -97,7 +97,7 @@ sub migrate {
 
     $tries->{migrate}->{$id} = 0; # reset counts
 
-    return $class->SUPER::migrate($haenv, $id, $target, $online);
-
+    return $class->SUPER::migrate($haenv, $id, $target, $online, $migrate_options);
 }
+
 1;
-- 
2.47.3