Re: [PATCH ha-manager v3 05/21] lrm: resource migration: support extra migration options

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

On Fri Sep 18, 2026 at 6:08 PM CEST, Fiona Ebner wrote:
> 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>
> ---
>
> New in v3.
>
>  src/PVE/HA/LRM.pm                    | 15 ++++++++++-----
>  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   |  2 +-
>  src/PVE/HA/Sim/Resources/VirtFail.pm |  2 +-
>  7 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
> index 72e37e6..5fc66eb 100644
> --- a/src/PVE/HA/LRM.pm
> +++ b/src/PVE/HA/LRM.pm
> @@ -749,14 +749,19 @@ 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 = {
> +            'target' => $sd->{target},
> +            'timeout' => $sd->{timeout},
> +        };
> +        if (defined($sd->{'migrate-options'})) {
> +            $params->{'migrate-options'} = $sd->{'migrate-options'};
> +        }

nit: pre-existing, but since 'target' and 'timeout' are set in the
     $params hash here unconditionally, couldn't we do the same for
     'migrate-options' here as well, just for consistency/readability?

     $params would then just be the hash of $sd properties that can be
     passed through as LRM resource command properties, but need a
     definedness check before these are used in the LRM workers.

> +
>          $self->queue_resource_command(
>              $sid,
>              $sd->{uid},
>              $request_state,
> -            {
> -                'target' => $sd->{target},
> -                'timeout' => $sd->{timeout},
> -            },
> +            $params,
>          );
>      }
>  
> @@ -1040,7 +1045,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) {

[ -->8- snip -8<-- ]

> diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
> index 177b907..3d8a5b9 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 sort keys $migrate_options->%*;

nit: unnecessary sort here

> +
>      # 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..964f374 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 sort keys $migrate_options->%*;

nit: unnecessary sort here

> +
>      # explicitly shutdown if $online isn't true (relocate)
>      if (!$online && $class->check_running($haenv, $id)) {
>          $class->shutdown($haenv, $id);

[ -->8- snip -8<-- ]