From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH qemu-server v6 21/26] migration: intra-cluster: check config can be parsed on target node
Date: Tue, 3 Nov 2026 13:48:13 +0100 [thread overview]
Message-ID: <20261103124831.139399-22-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261103124831.139399-1-f.ebner@proxmox.com>
For remote migration, we already check that the config can be parsed
on the target. Do the same for intra-cluster migration, to avoid
issues like [0] for future new settings, with lines being unexpectedly
and relatively silently dropped (there are warnings in the target's
system logs, but nothing else).
Unfortunately, before commit "qm: mtunnel: reply when a command is
unknown", which is part of the same patch series, when a command is
unknown, mtunnel did not reply at all. Therefore, check that the
target node is recent enough to support the new mtunnel command.
[0]: https://bugzilla.proxmox.com/show_bug.cgi?id=7341
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
The pve-manager version in the check must be adapted upon applying!
Changes in v6:
* Bump pve-manger version in node version check.
src/PVE/API2/Qemu.pm | 10 +++++++++
src/PVE/QemuMigrate.pm | 27 +++++++++++++++++++++++
src/test/MigrationTest/QemuMigrateMock.pm | 11 ++++++++-
3 files changed, 47 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/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm
index 4ee36443..5f8f4724 100644
--- a/src/PVE/QemuMigrate.pm
+++ b/src/PVE/QemuMigrate.pm
@@ -360,6 +360,33 @@ sub prepare {
my $cmd = [@{ $self->{rem_ssh} }, '/bin/true'];
eval { $self->cmd_quiet($cmd); };
die "Can't connect to destination address using public key\n" if $@;
+
+ if (!$self->{opts}->{'skip-config-check'}) {
+ if (PVE::Cluster::node_pvecfg_version_at_least($self->{node}, 9, 2, 26)) {
+ # Fork a short-lived tunnel for checking the config. Later, the proper tunnel with
+ # SSH forwarding info is forked.
+ my $tunnel = $self->fork_tunnel();
+ # Compared to remote migration, which also does volume activation, this only
+ # strictly parses the config, so no too large timeout is needed.
+ eval {
+ my $nodename = PVE::INotify::nodename();
+ PVE::Tunnel::write_tunnel($tunnel, 30, "config $vmid $nodename");
+ };
+ my $err = $@;
+
+ eval { PVE::Tunnel::finish_tunnel($tunnel); };
+ $self->log('warn', "failed to finish tunnel in prepare() - $@") if $@;
+
+ if ($err) {
+ chomp($err);
+ die "$err - use 'skip-config-check' flag to migrate regardless\n";
+ }
+ } else {
+ $self->log('info', "skipping config check - target pve-manager version < 9.2.26");
+ }
+ } else {
+ $self->log('info', "skipping config check - override option is set");
+ }
}
return $running;
diff --git a/src/test/MigrationTest/QemuMigrateMock.pm b/src/test/MigrationTest/QemuMigrateMock.pm
index c715a60e..a2e97315 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-03 12:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 12:47 [PATCH-SERIES many v6 00/26] migration: strict config check for intra-cluster migration Fiona Ebner
2026-11-03 12:47 ` [PATCH common v6 01/26] rest handler: handle: respect schema's 'type-property' when resolving type Fiona Ebner
2026-11-03 12:47 ` [PATCH cluster v6 02/26] cluster: add more convenience helpers for checking node versions Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 03/26] manager: add missing PVE::HA::Resources import Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 04/26] update crm commands: align logging with next state started/stopped Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 05/26] manager: factor out helper to check if requested resource motion is valid Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 06/26] next state stopped: align logging for motion command with next_state_started() Fiona Ebner
2026-11-03 12:47 ` [PATCH ha-manager v6 07/26] next state {stopped,started}: factor out helper to handle motion command Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 08/26] lrm: resource migration: support extra migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 09/26] change service state: support hash as a parameter value Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 10/26] next state: handle motion command: support migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 11/26] resources: add migrate_json_properties() method Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 12/26] queue resource motion: support migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 13/26] crm command: support JSON-style migrate command Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 14/26] api: resources: migration: support additional migration options Fiona Ebner
2026-11-03 12:48 ` [PATCH ha-manager v6 15/26] test: add test for " Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 16/26] helpers: move get_node_pvecfg_version() version helper to pve-cluster Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 17/26] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 18/26] fix #7053: api: migrate: pass 'with-conntrack-state' flag to HA migration Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 19/26] qm: mtunnel: reply when a command is unknown Fiona Ebner
2026-11-03 12:48 ` [PATCH qemu-server v6 20/26] qm: mtunnel: add 'conf' command to do strict configuration parsing Fiona Ebner
2026-11-03 12:48 ` Fiona Ebner [this message]
2026-11-03 12:48 ` [PATCH container v6 22/26] api: migrate: allow forwarding certain migration properties to HA Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 23/26] pct: introduce mtunnel command Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 24/26] d/control: bump versioned build dependency for libpve-common-perl to 9.0.12 Fiona Ebner
2026-11-03 12:48 ` [PATCH container v6 25/26] migration: intra-cluster: check config can be parsed on target node Fiona Ebner
2026-11-03 12:48 ` [PATCH manager v6 26/26] ui: migrate: add checkbox to allow skipping newly enforced config check 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=20261103124831.139399-22-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