From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH qemu-server v7 11/32] migration: add 'skip-config-check' property and adapt to guest-common
Date: Thu, 12 Nov 2026 12:48:43 +0100 [thread overview]
Message-ID: <20261112115001.107306-12-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261112115001.107306-1-f.ebner@proxmox.com>
With pve-guest-common commit "abstract migrate: intra-cluster: check
config can be parsed on target", there now is a check to see if the
configuration file can be parsed on the target node, so there should
be a way to opt-out as an escape hatch.
The tests need to be adapted for compatibility.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes in v7:
* Use factored out helper from guest-common.
src/PVE/API2/Qemu.pm | 10 ++++++++++
src/test/MigrationTest/QemuMigrateMock.pm | 11 ++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm
index 98b250fa..6a6f15b2 100644
--- a/src/PVE/API2/Qemu.pm
+++ b/src/PVE/API2/Qemu.pm
@@ -143,6 +143,15 @@ my $migrate_json_properties = {
default => 0,
description => 'Whether to migrate conntrack entries for running VMs.',
},
+ 'skip-config-check' => {
+ type => 'boolean',
+ optional => 1,
+ default => 0,
+ description =>
+ 'For intra-cluster migration. Skip checking if the configuration can be parsed'
+ . ' successfully by the target. Using this flag can lead to dropped'
+ . ' configuration options if the target is too old to parse them.',
+ },
};
# Properties that will be forwarded via the HA stack to the LRM, which will then use them for its
@@ -150,6 +159,7 @@ my $migrate_json_properties = {
# HA migrations with many being hard-coded for the LRM invocation.
my $ha_migrate_props = {
'with-conntrack-state' => 1,
+ 'skip-config-check' => 1,
};
sub ha_migrate_json_properties {
diff --git a/src/test/MigrationTest/QemuMigrateMock.pm b/src/test/MigrationTest/QemuMigrateMock.pm
index be1a7368..90d905f6 100644
--- a/src/test/MigrationTest/QemuMigrateMock.pm
+++ b/src/test/MigrationTest/QemuMigrateMock.pm
@@ -66,6 +66,10 @@ $tunnel_module->mock(
my $vmid = $1;
die "resuming wrong VM '$vmid'\n" if $vmid ne $test_vmid;
return;
+ } elsif ($command =~ m/^config (\d+) (\S+)$/) {
+ my ($vmid, $node) = ($1, $2);
+ die "check config for wrong VM '$vmid'\n" if $vmid ne $test_vmid;
+ return;
}
die "write_tunnel (mocked) - implement me: $command\n";
},
@@ -74,7 +78,12 @@ $tunnel_module->mock(
my $qemu_migrate_module = Test::MockModule->new("PVE::QemuMigrate");
$qemu_migrate_module->mock(
fork_tunnel => sub {
- die "fork_tunnel (mocked) - implement me\n"; # currently no call should lead here
+ return {
+ writer => "mocked",
+ reader => "mocked",
+ pid => 123456,
+ version => 1,
+ };
},
start_remote_tunnel => sub {
my ($self, $raddr, $rport, $ruri, $unix_socket_info) = @_;
--
2.47.3
next prev parent reply other threads:[~2026-11-12 11:51 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 ` Fiona Ebner [this message]
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 ` 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-12-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