From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 7E6691FF0C1 for ; Fri, 18 Sep 2026 18:12:03 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 35D22215DD; Fri, 18 Sep 2026 18:09:16 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 13/21] api: migrate: allow forwarding certain migration properties to HA Date: Fri, 18 Sep 2026 18:08:19 +0200 Message-ID: <20260918160841.128088-14-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918160841.128088-1-f.ebner@proxmox.com> References: <20260918160841.128088-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: 1789747730191 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.575 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) 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: POLO5VRNSA53KN6S5XKTZGT265CPN3LQ X-Message-ID-Hash: POLO5VRNSA53KN6S5XKTZGT265CPN3LQ 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 the existing 'with-conntrack-state' option will be forwarded too, to fix bug #7053. Signed-off-by: Fiona Ebner --- New in v3. src/PVE/API2/Qemu.pm | 146 ++++++++++++++++++++++++------------------- 1 file changed, 83 insertions(+), 63 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 71247eec..b5a850a3 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -80,6 +80,77 @@ BEGIN { use base qw(PVE::RESTHandler); +my $migrate_json_properties = { + node => get_standard_option('pve-node'), + vmid => get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), + target => get_standard_option( + 'pve-node', + { + description => "Target node.", + completion => \&PVE::Cluster::complete_migration_target, + }, + ), + online => { + type => 'boolean', + description => "Use online/live migration if VM is running. Ignored if VM is stopped.", + optional => 1, + }, + force => { + type => 'boolean', + description => + "Allow to migrate VMs which use local devices. Only root may use this option.", + optional => 1, + }, + migration_type => { + type => 'string', + enum => ['secure', 'insecure'], + description => + "Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.", + optional => 1, + }, + migration_network => { + type => 'string', + format => 'CIDR', + description => "CIDR of the (sub) network that is used for migration.", + optional => 1, + }, + "with-local-disks" => { + type => 'boolean', + description => "Enable live storage migration for local disk", + optional => 1, + }, + targetstorage => get_standard_option( + 'pve-targetstorage', + { + completion => \&PVE::QemuServer::complete_migration_storage, + }, + ), + bwlimit => { + description => "Override I/O bandwidth limit (in KiB/s).", + optional => 1, + type => 'integer', + minimum => '0', + default => 'migrate limit from datacenter or storage config', + }, + 'with-conntrack-state' => { + type => 'boolean', + optional => 1, + default => 0, + description => 'Whether to migrate conntrack entries for running VMs.', + }, +}; + +# 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 $opt_force_description = "Force physical removal. Without this, we simple remove the disk from the config file and create an additional configuration entry called 'unused[n]', which contains the volume ID. Unlink of unused[n] always cause physical removal."; @@ -5489,67 +5560,7 @@ __PACKAGE__->register_method({ }, parameters => { additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - vmid => - get_standard_option('pve-vmid', { completion => \&PVE::QemuServer::complete_vmid }), - target => get_standard_option( - 'pve-node', - { - description => "Target node.", - completion => \&PVE::Cluster::complete_migration_target, - }, - ), - online => { - type => 'boolean', - description => - "Use online/live migration if VM is running. Ignored if VM is stopped.", - optional => 1, - }, - force => { - type => 'boolean', - description => - "Allow to migrate VMs which use local devices. Only root may use this option.", - optional => 1, - }, - migration_type => { - type => 'string', - enum => ['secure', 'insecure'], - description => - "Migration traffic is encrypted using an SSH tunnel by default. On secure, completely private networks this can be disabled to increase performance.", - optional => 1, - }, - migration_network => { - type => 'string', - format => 'CIDR', - description => "CIDR of the (sub) network that is used for migration.", - optional => 1, - }, - "with-local-disks" => { - type => 'boolean', - description => "Enable live storage migration for local disk", - optional => 1, - }, - targetstorage => get_standard_option( - 'pve-targetstorage', - { - completion => \&PVE::QemuServer::complete_migration_storage, - }, - ), - bwlimit => { - description => "Override I/O bandwidth limit (in KiB/s).", - optional => 1, - type => 'integer', - minimum => '0', - default => 'migrate limit from datacenter or storage config', - }, - 'with-conntrack-state' => { - type => 'boolean', - optional => 1, - default => 0, - description => 'Whether to migrate conntrack entries for running VMs.', - }, - }, + properties => $migrate_json_properties, }, returns => { type => 'string', @@ -5641,9 +5652,18 @@ __PACKAGE__->register_method({ my $hacmd = sub { my $upid = shift; - print "Requesting HA migration for VM $vmid to node $target\n"; - + my $extra_opts = ''; my $cmd = ['ha-manager', 'migrate', "vm:$vmid", $target]; + for my $prop (sort keys $ha_migrate_props->%*) { + if (defined(my $value = $param->{$prop})) { + push($cmd->@*, "--$prop", $value); + $extra_opts .= ','; + $extra_opts .= " $prop=$value"; + } + } + + print "Requesting HA migration for VM $vmid to node ${target}${extra_opts}\n"; + run_command($cmd); return; }; -- 2.47.3