From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH ha-manager v7 28/32] queue resource motion: support migration options
Date: Thu, 12 Nov 2026 12:49:00 +0100 [thread overview]
Message-ID: <20261112115001.107306-29-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261112115001.107306-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>
Reviewed-by: Michael Köppl <m.koeppl@proxmox.com>
Tested-by: Michael Köppl <m.koeppl@proxmox.com>
---
No changes in v7.
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
next prev parent reply other threads:[~2026-11-12 11:54 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-12 11:48 [PATCH-SERIES many v7 00/32] migration: strict config check for intra-cluster migration Fiona Ebner
2026-11-12 11:48 ` [PATCH guest-common v7 01/32] abstract migrate: add missing imports Fiona Ebner
2026-11-13 12:46 ` Michael Köppl
2026-11-12 11:48 ` [PATCH guest-common v7 02/32] abstract migrate: declare fork_tunnel() as an abstract method Fiona Ebner
2026-11-13 12:46 ` Michael Köppl
2026-11-13 12:51 ` Fiona Ebner
2026-11-12 11:48 ` [PATCH guest-common v7 03/32] abstract migrate: add method for common early checks Fiona Ebner
2026-11-13 12:47 ` Michael Köppl
2026-11-12 11:48 ` [PATCH guest-common v7 04/32] abstract migrate: intra-cluster: check config can be parsed on target Fiona Ebner
2026-11-13 12:47 ` Michael Köppl
2026-11-12 11:48 ` [PATCH qemu-server v7 05/32] helpers: move get_node_pvecfg_version() version helper to pve-cluster Fiona Ebner
2026-11-13 12:47 ` Michael Köppl
2026-11-12 11:48 ` [PATCH qemu-server v7 06/32] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-13 12:47 ` Michael Köppl
2026-11-12 11:48 ` [PATCH qemu-server v7 07/32] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-11-12 11:48 ` [PATCH qemu-server v7 08/32] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-11-12 11:48 ` [PATCH qemu-server v7 09/32] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-11-12 11:48 ` [PATCH qemu-server v7 10/32] migrate: call prepare_local_cluster_checks() method Fiona Ebner
2026-11-13 12:48 ` Michael Köppl
2026-11-13 13:09 ` Fiona Ebner
2026-11-13 13:22 ` Michael Köppl
2026-11-13 13:32 ` Fiona Ebner
2026-11-12 11:48 ` [PATCH qemu-server v7 11/32] migration: add 'skip-config-check' property and adapt to guest-common Fiona Ebner
2026-11-12 11:48 ` [PATCH qemu-server v7 12/32] api: ha migrate: delete with-conntrack-state for offline migration Fiona Ebner
2026-11-13 12:50 ` Michael Köppl
2026-11-12 11:48 ` [PATCH container v7 13/32] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-13 12:50 ` Michael Köppl
2026-11-12 11:48 ` [PATCH container v7 14/32] pct: introduce mtunnel command Fiona Ebner
2026-11-12 11:48 ` [PATCH container v7 15/32] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-11-12 11:48 ` [PATCH container v7 16/32] migrate: implement fork_tunnel() method Fiona Ebner
2026-11-13 12:50 ` Michael Köppl
2026-11-12 11:48 ` [PATCH container v7 17/32] migrate: call prepare_local_cluster_checks() method Fiona Ebner
2026-11-13 12:50 ` Michael Köppl
2026-11-12 11:48 ` [PATCH container v7 18/32] migrate: add 'skip-config-check' property Fiona Ebner
2026-11-13 12:51 ` Michael Köppl
2026-11-12 11:48 ` [PATCH ha-manager v7 19/32] manager: add missing PVE::HA::Resources import Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 20/32] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 21/32] manager: factor out helper to check if resource motion is valid Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 22/32] next state {started,stopped}: align logging for motion command Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 23/32] next state {stopped,started}: factor out helper to handle " Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 24/32] lrm: resource migration: support extra migration options Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 25/32] change service state: support hash as a parameter value Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 26/32] next state: handle motion command: support migration options Fiona Ebner
2026-11-12 11:48 ` [PATCH ha-manager v7 27/32] resources: add migrate_json_properties() method Fiona Ebner
2026-11-13 12:51 ` Michael Köppl
2026-11-12 11:49 ` Fiona Ebner [this message]
2026-11-12 11:49 ` [PATCH ha-manager v7 29/32] crm command: support JSON-style migrate command Fiona Ebner
2026-11-12 11:49 ` [PATCH ha-manager v7 30/32] api: resources: migration: support additional migration options Fiona Ebner
2026-11-12 11:49 ` [PATCH ha-manager v7 31/32] test: add test for " Fiona Ebner
2026-11-12 11:49 ` [PATCH manager v7 32/32] ui: migrate: add checkbox to allow skipping newly enforced config check Fiona Ebner
2026-11-13 12:51 ` Michael Köppl
2026-11-13 12:51 ` [PATCH-SERIES many v7 00/32] migration: strict config check for intra-cluster migration Michael Köppl
2026-11-18 14:22 ` applied: " Thomas Lamprecht
2026-11-18 14:36 ` 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=20261112115001.107306-29-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.