From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com, Fiona Ebner <f.ebner@proxmox.com>
Subject: applied: [PATCH-SERIES many v7 00/32] migration: strict config check for intra-cluster migration
Date: Wed, 18 Nov 2026 15:22:55 +0100 [thread overview]
Message-ID: <179501161074.1321919.11775152234630231861.b4-ty@b4> (raw)
In-Reply-To: <20261112115001.107306-1-f.ebner@proxmox.com>
On Thu, 12 Nov 2026 12:48:32 +0100, Fiona Ebner wrote:
> Changes in v7:
> * Drop already applied patches.
> * Bump pve-manager version in version checks.
> * Factor out config checking via tunnel into common helper.
> * Re-order HA manager patches later. While they are preparatory work
> for the feature, the actual dependency points in the other
> direction. The new feature is guarded via the node version check.
> * Also check that ha-manager is recent enough before passing
> additional migration options.
>
> [...]
Applied, thanks!
I adapted a few things on/after applying, mainly:
- guest-common: abort the migration if a stop request arrives while the
tunnel of the config check gets finished. That error was only logged
as warning before, so the migration continued until the task got
killed, without any cleanup. Also log when the check is skipped
because the local node is too old, like for the other skip reasons.
- qemu-server: moved the test mocks for the check tunnel from patch 11
into patch 10, so that each commit passes the migration tests with the
new guest-common, as Michael noted. Patch 11 is now titled "migration:
add 'skip-config-check' property".
- match the VMID of the new mtunnel 'config' command with [0-9] instead
of \d, and name that command correctly in the subject of patch 09.
- container: the 'skip-config-check' description now says that options
can get dropped or ignored, like the UI warning does.
- ha-manager: dropped the unused $ns of handle_resource_motion_command(),
include the command in the error for a JSON 'migrate' command without
sid or node, and added the semicolon Michael noted.
- reworded some comments and commit messages, for example to name
prepare_local_cluster_checks() instead of check_config_on_target(),
and fixed typos in the README of the new HA test.
Patch 15 got skipped, as pve-container already build-depends on
libpve-common-perl 9.2.10 now.
On top, I added migration tests for a target that rejects the config,
for the skip flag and for a target that is too old for the check.
[container] applied to pve-container.git (master)
[13/32] api: migrate: allow forwarding certain migration properties to HA
https://git.proxmox.com/?p=pve-container.git;a=commitdiff;h=f71e3771ecb5d6a4cf3ec14758d97bf8a44a0a92
[14/32] pct: introduce mtunnel command
https://git.proxmox.com/?p=pve-container.git;a=commitdiff;h=bcb5f6473056aa4d07807c342bcf1e930303a76f
[15/32] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12
(no commit info)
[16/32] migrate: implement fork_tunnel() method
https://git.proxmox.com/?p=pve-container.git;a=commitdiff;h=05a6e8606ab21f6ad93f51712ddd6dfa86384c16
[17/32] migrate: call prepare_local_cluster_checks() method
https://git.proxmox.com/?p=pve-container.git;a=commitdiff;h=a211798d8737cdd64c74071801050b50db908555
[18/32] migrate: add 'skip-config-check' property
https://git.proxmox.com/?p=pve-container.git;a=commitdiff;h=a9b93d0967541eb970d6eacfdf16b2e37a519b8d
[guest-common] applied to pve-guest-common.git (master)
[01/32] abstract migrate: add missing imports
https://git.proxmox.com/?p=pve-guest-common.git;a=commitdiff;h=5366d0cd5ac64ae9e63be0e8535e050daeb531ee
[02/32] abstract migrate: declare fork_tunnel() as an abstract method
https://git.proxmox.com/?p=pve-guest-common.git;a=commitdiff;h=e0274b086ca13b4dd601f2b03b38861f1adb2604
[03/32] abstract migrate: add method for common early checks
https://git.proxmox.com/?p=pve-guest-common.git;a=commitdiff;h=d25fbf4c5fbc897095129cabafd4134d5c1d7c7d
[04/32] abstract migrate: intra-cluster: check config can be parsed on target
https://git.proxmox.com/?p=pve-guest-common.git;a=commitdiff;h=28d218d05c56a47a1e5c9d4a505f84969db35f13
[ha-manager] applied to pve-ha-manager.git (master)
[19/32] manager: add missing PVE::HA::Resources import
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=d6153747a27e32c3c2d05ec0393dc86b850ef272
[20/32] update crm commands: align logging with next state started/stopped
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=091fec7f3ae81ffe9f6c3193b419abc7f6e00105
[21/32] manager: factor out helper to check if resource motion is valid
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=08068774e6430484be6631a4dcbedf210dc5e9c4
[22/32] next state {started,stopped}: align logging for motion command
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=a2109221302ec0bfd7823291781a4b3cea1cce97
[23/32] next state {stopped,started}: factor out helper to handle motion command
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=d367195a094ba7d4e9a106f52c3bb0658cb06149
[24/32] lrm: resource migration: support extra migration options
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=5e20e1350fa4f5ea29c187a367f31548174319cd
[25/32] change service state: support hash as a parameter value
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=9f1a10f4c7b6e52cd5fab0a9db8064e8a5db59eb
[26/32] next state: handle motion command: support migration options
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=99e8e59960bb638d4a8bf09ab8d1d8723cdc1988
[27/32] resources: add migrate_json_properties() method
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=e64727ca7b65a8d6f089353d71aceb5844be7b76
[28/32] queue resource motion: support migration options
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=a0fbbe647c9f188333794d88859b5c59b82e2184
[29/32] crm command: support JSON-style migrate command
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=0d627c4c50422ca599a7b52a6682d34733c38387
[30/32] api: resources: migration: support additional migration options
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=4b58f7adad5cbc199505b32518f42ba981931d7b
[31/32] test: add test for migration options
https://git.proxmox.com/?p=pve-ha-manager.git;a=commitdiff;h=7f9d11f6fabf1b32ddd68635248ac6814d4016f5
[manager] applied to pve-manager.git (master)
[32/32] ui: migrate: add checkbox to allow skipping newly enforced config check
https://git.proxmox.com/?p=pve-manager.git;a=commitdiff;h=fc68973a5513dc3dd07f005605717433a48a0ade
[qemu-server] applied to qemu-server.git (master)
[05/32] helpers: move get_node_pvecfg_version() version helper to pve-cluster
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=672d75bbae48a8fcab67d6dbf5a740e74e85e77b
[06/32] api: migrate: allow forwarding certain migration properties to HA
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=8211ca680b4273e549c2a4884c553d80c0c96890
[07/32] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=95bdaf289c629430f76a7a07a590fcc224c08dd9
[08/32] qm: mtunnel: reply when a command is unknown
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=a355d5a262bca167117f8726866c93f1efd37476
[09/32] qm: mtunnel: add 'conf' command to do strict configuration parsing
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=5121341a8515464df8874ccf2ea21d8b7bbd9955
[10/32] migrate: call prepare_local_cluster_checks() method
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=9162be6695c36731cde9e4a9269e2ce9050f6d05
[11/32] migration: add 'skip-config-check' property and adapt to guest-common
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=d4a265fd60b2448cfd6ef263dcb6889f075c19d5
[12/32] api: ha migrate: delete with-conntrack-state for offline migration
https://git.proxmox.com/?p=qemu-server.git;a=commitdiff;h=7541e31c98333e05a5339e74a7076331854d60b6
next prev parent reply other threads:[~2026-11-18 14:25 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 ` [PATCH ha-manager v7 28/32] queue resource motion: support migration options Fiona Ebner
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 ` Thomas Lamprecht [this message]
2026-11-18 14:36 ` applied: " 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=179501161074.1321919.11775152234630231861.b4-ty@b4 \
--to=t.lamprecht@proxmox.com \
--cc=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.