From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 12AA51FF0BC for ; Thu, 15 Oct 2026 14:54:27 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C511821851; Thu, 15 Oct 2026 14:52:30 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH container v4 23/27] api: migrate: allow forwarding certain migration properties to HA Date: Thu, 15 Oct 2026 14:50:57 +0200 Message-ID: <20261015125112.174954-24-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261015125112.174954-1-f.ebner@proxmox.com> References: <20261015125112.174954-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1792068677702 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.400 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 7M4UGCEAH4FAUHLMCFTHMRDJRQ5XFV5K X-Message-ID-Hash: 7M4UGCEAH4FAUHLMCFTHMRDJRQ5XFV5K X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Empty for now, but there is a 'skip-config-check' option planned that will be forwarded. And this is also done for consistency with VMs, where the existing 'with-conntrack-state' option will be forwarded too. Signed-off-by: Fiona Ebner --- Changes in v4: * Use parentheses when logging migration options. src/PVE/API2/LXC.pm | 96 ++++++++++++++++++++++++++++----------------- 1 file changed, 59 insertions(+), 37 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 5f94d5a..1b2c0e2 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -48,6 +48,53 @@ BEGIN { } } +my $migrate_json_properties = { + node => get_standard_option('pve-node'), + vmid => get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }), + target => get_standard_option( + 'pve-node', + { + description => "Target node.", + completion => \&PVE::Cluster::complete_migration_target, + }, + ), + 'target-storage' => get_standard_option('pve-targetstorage'), + online => { + type => 'boolean', + description => "Use online/live migration.", + optional => 1, + }, + restart => { + type => 'boolean', + description => "Use restart migration", + optional => 1, + }, + timeout => { + type => 'integer', + description => "Timeout in seconds for shutdown for restart migration", + optional => 1, + default => 180, + }, + bwlimit => { + description => "Override I/O bandwidth limit (in KiB/s).", + optional => 1, + type => 'number', + minimum => '0', + default => 'migrate limit from datacenter or storage config', + }, +}; + +# Properties that will be forwarded via the HA stack to the LRM, which will then use them for its +# own invocation of the migration API endpoint. The other properties are not forwarded and lost for +# HA migrations with many being hard-coded for the LRM invocation. +my $ha_migrate_props = {}; + +sub ha_migrate_json_properties { + my $forwarded_props = {}; + $forwarded_props->{$_} = $migrate_json_properties->{$_} for keys $ha_migrate_props->%*; + return $forwarded_props; +} + my sub assert_not_restore_from_external { my ($archive, $storage_cfg) = @_; @@ -1633,42 +1680,7 @@ __PACKAGE__->register_method({ }, parameters => { additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - vmid => - get_standard_option('pve-vmid', { completion => \&PVE::LXC::complete_ctid }), - target => get_standard_option( - 'pve-node', - { - description => "Target node.", - completion => \&PVE::Cluster::complete_migration_target, - }, - ), - 'target-storage' => get_standard_option('pve-targetstorage'), - online => { - type => 'boolean', - description => "Use online/live migration.", - optional => 1, - }, - restart => { - type => 'boolean', - description => "Use restart migration", - optional => 1, - }, - timeout => { - type => 'integer', - description => "Timeout in seconds for shutdown for restart migration", - optional => 1, - default => 180, - }, - bwlimit => { - description => "Override I/O bandwidth limit (in KiB/s).", - optional => 1, - type => 'number', - minimum => '0', - default => 'migrate limit from datacenter or storage config', - }, - }, + properties => $migrate_json_properties, }, returns => { type => 'string', @@ -1732,10 +1744,20 @@ __PACKAGE__->register_method({ my $upid = shift; my $service = "ct:$vmid"; + my $extra_opts = ''; my $cmd = ['ha-manager', 'migrate', $service, $target]; + for my $prop (sort keys $ha_migrate_props->%*) { + if (defined(my $value = $param->{$prop})) { + push($cmd->@*, "--$prop", $value); + $extra_opts .= ', ' if $extra_opts; + $extra_opts .= "$prop=$value"; + } + } - print "Requesting HA migration for CT $vmid to node $target\n"; + my $msg = "Requesting HA migration for CT $vmid to node $target"; + $msg .= " (${extra_opts})" if $extra_opts; + print "$msg\n"; PVE::Tools::run_command($cmd); -- 2.47.3