public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH ha-manager v5 13/28] queue resource motion: support migration options
Date: Mon, 19 Oct 2026 16:45:55 +0200	[thread overview]
Message-ID: <20261019144629.215541-14-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261019144629.215541-1-f.ebner@proxmox.com>

For dependent resource, it is necessary to filter out migration
properties that are not applicable to the resource's type.

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

No changes in v5.

 src/PVE/HA/Manager.pm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index f5592e6..b8d0e3e 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -296,7 +296,7 @@ sub load_balance {
     );
     $haenv->log('info', "auto rebalance - $task $sid to $target ($imbalance_change_str)");
 
-    $self->queue_resource_motion($cmd, $task, $sid, $target);
+    $self->queue_resource_motion($cmd, $task, $sid, $target, {});
 }
 
 sub cleanup {
@@ -611,7 +611,7 @@ sub read_lrm_status {
 }
 
 sub queue_resource_motion {
-    my ($self, $cmd, $task, $sid, $target) = @_;
+    my ($self, $cmd, $task, $sid, $target, $migrate_options) = @_;
 
     my ($haenv, $sc, $ss, $ns, $compiled_rules) = $self->@{qw(haenv sc ss ns compiled_rules)};
     my $online_nodes = { map { $_ => 1 } $self->{ns}->list_online_nodes()->@* };
@@ -642,18 +642,40 @@ sub queue_resource_motion {
     }
 
     $haenv->log('info', "got crm command: $cmd");
-    $ss->{$sid}->{cmd} = [$task, $target];
+    $ss->{$sid}->{cmd} = [$task, $target, $migrate_options];
+
+    # For dependent resources of a different type, filter unapplicable options.
+    my $_migrate_options_for_type = {};
+    my $migrate_options_for_type = sub {
+        my ($type) = @_;
+        return $_migrate_options_for_type->{$type}
+            if defined($_migrate_options_for_type->{$type});
+
+        my $plugin = PVE::HA::Resources->lookup($type);
+        my $applicable_properties = $plugin->migrate_json_properties();
+
+        $_migrate_options_for_type->{$type} = {};
+        for my $key (keys $migrate_options->%*) {
+            next if !exists($applicable_properties->{$key});
+            $_migrate_options_for_type->{$type}->{$key} = $migrate_options->{$key};
+        }
+
+        return $_migrate_options_for_type->{$type};
+    };
 
     for my $csid (@$dependent_resources) {
         next if $ss->{$csid}->{node} && $ss->{$csid}->{node} eq $target;
         next if $ss->{$csid}->{target} && $ss->{$csid}->{target} eq $target;
 
+        my $type = ($haenv->parse_sid($csid))[1];
+        my $applicable_migrate_options = $migrate_options_for_type->($type);
+
         $haenv->log(
             'info',
             "crm command '$cmd' - $task service '$csid' to node '$target'"
                 . " (service '$csid' in positive affinity with service '$sid')",
         );
-        $ss->{$csid}->{cmd} = [$task, $target];
+        $ss->{$csid}->{cmd} = [$task, $target, $applicable_migrate_options];
     }
 }
 
@@ -705,7 +727,7 @@ sub update_crm_commands {
             my ($task, $sid, $node) = ($1, $2, $3);
             if (my $sd = $ss->{$sid}) {
                 if (check_resource_motion_valid($self, $node, $sd, "ignore crm command '$cmd'")) {
-                    $self->queue_resource_motion($cmd, $task, $sid, $node);
+                    $self->queue_resource_motion($cmd, $task, $sid, $node, {});
                 }
             } else {
                 $haenv->log('err', "crm command error - no such service: $cmd");
-- 
2.47.3





  parent reply	other threads:[~2026-10-19 14:48 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-19 14:45 [PATCH-SERIES many v5 00/28] migration: strict config check for intra-cluster migration Fiona Ebner
2026-10-19 14:45 ` [PATCH common v5 01/28] tools: move version_cmp() helper from qemu-server Fiona Ebner
2026-10-19 14:45 ` [PATCH common v5 02/28] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-10-19 14:45 ` [PATCH cluster v5 03/28] cluster: move pvecfg node version helpers from qemu-server Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 04/28] manager: add missing PVE::HA::Resources import Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 05/28] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 06/28] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 07/28] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 08/28] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 09/28] lrm: resource migration: support extra migration options Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 10/28] change service state: support hash as a parameter value Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 11/28] next state: handle motion command: support migration options Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 12/28] resources: add migrate_json_properties() method Fiona Ebner
2026-10-19 14:45 ` Fiona Ebner [this message]
2026-10-19 14:45 ` [PATCH ha-manager v5 14/28] crm command: support JSON-style migrate command Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 15/28] api: resources: migration: support additional migration options Fiona Ebner
2026-10-19 14:45 ` [PATCH ha-manager v5 16/28] test: add test for " Fiona Ebner
2026-10-19 14:45 ` [PATCH qemu-server v5 17/28] helpers: move version_cmp() helper to pve-common Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 18/28] helpers: move pvecfg node version helpers to pve-cluster Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 19/28] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 20/28] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 21/28] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 22/28] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-10-19 14:46 ` [PATCH qemu-server v5 23/28] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 24/28] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 25/28] pct: introduce mtunnel command Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 26/28] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-10-19 14:46 ` [PATCH container v5 27/28] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-10-19 14:46 ` [PATCH manager v5 28/28] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261019144629.215541-14-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal