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 container v3 18/21] api: migrate: allow forwarding certain migration properties to HA
Date: Fri, 18 Sep 2026 18:08:24 +0200	[thread overview]
Message-ID: <20260918160841.128088-19-f.ebner@proxmox.com> (raw)
In-Reply-To: <20260918160841.128088-1-f.ebner@proxmox.com>

From: Fiona Ebner <phi@faeony.eu>

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 <f.ebner@proxmox.com>
---

New in v3.

 src/PVE/API2/LXC.pm | 94 +++++++++++++++++++++++++++------------------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 5f94d5a..c89837e 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,18 @@ __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 .= ',';
+                        $extra_opts .= " $prop=$value";
+                    }
+                }
 
-                print "Requesting HA migration for CT $vmid to node $target\n";
+                print "Requesting HA migration for CT $vmid to node ${target}${extra_opts}\n";
 
                 PVE::Tools::run_command($cmd);
 
-- 
2.47.3





  parent reply	other threads:[~2026-09-18 16:11 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-18 16:08 [PATCH-SERIES common/cluster/ha-manager/qemu-server/container v3 00/21] migration: strict config check for intra-cluster migration Fiona Ebner
2026-09-18 16:08 ` [PATCH common v3 01/21] tools: move version_cmp() helper from qemu-server Fiona Ebner
2026-09-18 16:08 ` [PATCH common v3 02/21] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-09-18 16:08 ` [PATCH cluster v3 03/21] cluster: move pvecfg node version helpers from qemu-server Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 04/21] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 05/21] lrm: resource migration: support extra migration options Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 06/21] change service state: support hash as a parameter value Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 07/21] next state: handle motion command: support migration options Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 08/21] queue resource motion: " Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 09/21] crm command: support JSON-style migrate command Fiona Ebner
2026-09-18 16:08 ` [PATCH ha-manager v3 10/21] api: resources: migration: support additional migration options Fiona Ebner
2026-09-18 16:21   ` Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 11/21] helpers: move version_cmp() helper to pve-common Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 12/21] helpers: move pvecfg node version helpers to pve-cluster Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 13/21] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 14/21] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 15/21] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 16/21] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-09-18 16:08 ` [PATCH qemu-server v3 17/21] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-09-18 16:08 ` Fiona Ebner [this message]
2026-09-18 16:08 ` [PATCH container v3 19/21] pct: introduce mtunnel command Fiona Ebner
2026-09-18 16:08 ` [PATCH container v3 20/21] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-09-18 16:08 ` [PATCH container v3 21/21] migration: intra-cluster: check config can be parsed on target node 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=20260918160841.128088-19-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