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 C3D471FF0DA for ; Thu, 19 Nov 2026 20:24:49 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 1297621B5D; Thu, 19 Nov 2026 20:20:23 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH manager v5 34/41] api: bulk migrate: refuse targets that would drop the guest identity Date: Thu, 19 Nov 2026 20:19:06 +0100 Message-ID: <20261119191914.2336934-35-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119191914.2336934-1-t.lamprecht@proxmox.com> References: <20261119191914.2336934-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795115961219 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 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 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: 6VP3A6C4N225MINP3THYUENOLWT3RQ3Z X-Message-ID-Hash: 6VP3A6C4N225MINP3THYUENOLWT3RQ3Z X-MailFrom: t.lamprecht@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: A node that keeps the guest identity refuses to migrate a guest to a node that does not. A bulk migration to such a node therefore logged one warning per guest and only failed after it had tried all of them. Check the target once, before the task starts. The migration of all guests of a node runs on that node. The check there gives the same result as the check of each single migration. The cluster-wide bulk migration is different. It runs on the node that handles the request, while each guest migrates from its own node, and a source node with an older version does not check the target at all. So refuse there only if at least one selected guest that is not on the target yet is on a node that keeps the identity. Guests can then still move between two older nodes, for example to empty a node before its upgrade. Check first that the target node exists, because the version check would report a mistyped node name as a node without version information. Add a test for the cluster-wide check with sources and targets of both kinds. Signed-off-by: Thomas Lamprecht Reviewed-by: Dominik Csapak Tested-by: Dominik Csapak --- changes v4 -> v5: * new test for the cluster-wide check, with source and target nodes of both kinds * one comment reworded changes v3 -> v4: * cluster-wide bulk migration: refuse up front only if a selected guest that is not on the target yet sits on a node that keeps the identity, so that guests can still move between two older nodes, for example to empty one before its upgrade; v3 refused that * commit message: plainer wording, same content changes v2 -> v3: * also check the target of the cluster-wide bulk migration once before the task starts, after checking that the node exists; subject changed accordingly changes v1 -> v2: * new in v2 PVE/API2/Cluster/BulkAction/Guest.pm | 17 +++++ PVE/API2/Nodes.pm | 3 + test/BulkMigrate_test.pl | 102 +++++++++++++++++++++++++++ test/Makefile | 6 +- 4 files changed, 127 insertions(+), 1 deletion(-) create mode 100755 test/BulkMigrate_test.pl diff --git a/PVE/API2/Cluster/BulkAction/Guest.pm b/PVE/API2/Cluster/BulkAction/Guest.pm index a55ea2ea..a2e92d14 100644 --- a/PVE/API2/Cluster/BulkAction/Guest.pm +++ b/PVE/API2/Cluster/BulkAction/Guest.pm @@ -6,6 +6,7 @@ use warnings; use PVE::APIClient::LWP; use PVE::Cluster; use PVE::Exception qw(raise raise_perm_exc raise_param_exc); +use PVE::GuestIdentity; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option); use PVE::RESTEnvironment qw(log_warn); @@ -760,6 +761,22 @@ __PACKAGE__->register_method({ check_guest_permissions($rpcenv, $authuser, $vmlist, ['VM.Migrate']); + my $target = $param->{target}; + PVE::Cluster::check_node_exists($target); + + # A source node that keeps the guest identity refuses an older target for each guest, so + # refuse once instead. Older source nodes do not check the target, so do not refuse for them. + my $cluster_vmlist = PVE::Cluster::get_vmlist() // {}; + my $guests = $cluster_vmlist->{ids} // {}; + my $sources = {}; + for my $vmid (scalar($vmlist->@*) ? $vmlist->@* : keys $guests->%*) { + my $node = $guests->{$vmid} ? $guests->{$vmid}->{node} : undef; + $sources->{$node} = 1 if defined($node) && $node ne $target; + } + if (grep { !PVE::GuestIdentity::node_identity_unsupported($_) } keys $sources->%*) { + PVE::GuestIdentity::assert_node_supports_identity($target); + } + my $code = sub { my $list = PVE::API2::Nodes::Nodeinfo::get_filtered_vmlist(undef, $vmlist_string, 1, 1); diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 07b3ce1f..8dc409bf 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -23,6 +23,7 @@ use PVE::Cluster qw(cfs_read_file); use PVE::DataCenterConfig; use PVE::Exception qw(raise raise_perm_exc raise_param_exc); use PVE::Firewall; +use PVE::GuestIdentity; use PVE::HA::Config; use PVE::HA::Env::PVE2; use PVE::INotify; @@ -2766,6 +2767,8 @@ __PACKAGE__->register_method({ PVE::Cluster::check_cfs_quorum(); PVE::Cluster::check_node_exists($target); + # refuse once instead of failing the migration of every guest + PVE::GuestIdentity::assert_node_supports_identity($target); my $datacenterconfig = cfs_read_file('datacenter.cfg'); # prefer parameter over datacenter cfg settings diff --git a/test/BulkMigrate_test.pl b/test/BulkMigrate_test.pl new file mode 100755 index 00000000..dfacf95a --- /dev/null +++ b/test/BulkMigrate_test.pl @@ -0,0 +1,102 @@ +#!/usr/bin/perl + +use v5.36; + +use lib ('.', '..'); + +use JSON; +use Test::MockModule; +use Test::More; + +use PVE::GuestIdentity; +use PVE::RPCEnvironment; + +use PVE::API2::Cluster::BulkAction::Guest; + +my $new = PVE::GuestIdentity::MIN_PVE_MANAGER_VERSION; +# the Proxmox VE version that each node reports, 'unknown' reports none +my $versions = { old1 => '9.1.1', old2 => '9.1.1', new1 => $new, new2 => $new }; +my $default_guests = { 100 => 'old1', 101 => 'new1', 102 => 'old2', 103 => 'new2' }; +my $guests; # VMID to node + +my $cluster_mock = Test::MockModule->new('PVE::Cluster'); +$cluster_mock->redefine( + check_node_exists => sub { }, + get_vmlist => sub { + return { + ids => { map { $_ => { node => $guests->{$_}, type => 'qemu' } } keys %$guests } }; + }, + get_node_kv => sub($key, $node) { + return {} if !defined($versions->{$node}); + return { $node => encode_json({ version => $versions->{$node} }) }; + }, +); + +my $started; # whether the handler got to start the migration task +my $rpcenv = bless {}, 'PVE::RPCEnvironment'; +my $rpcenv_mock = Test::MockModule->new('PVE::RPCEnvironment'); +$rpcenv_mock->redefine( + get => sub { return $rpcenv }, + get_user => sub { return 'root@pam' }, + check => sub { return 1 }, + fork_worker => sub { $started = 1; return 'UPID:test' }, +); + +my $method = PVE::API2::Cluster::BulkAction::Guest->map_method_by_name('migrate'); + +my $too_old = qr/^node 'old2' runs Proxmox VE 9\.1\.1, keeping the guest identity requires/; + +for my $case ( + { name => 'older source, older target', vms => [100], target => 'old2' }, + { + name => 'newer source, older target', + vms => [101], + target => 'old2', + refused => $too_old, + }, + { name => 'newer source, newer target', vms => [101], target => 'new2' }, + { name => 'older source, newer target', vms => [100], target => 'new2' }, + { + name => 'older and newer source, older target', + vms => [100, 101], + target => 'old2', + refused => $too_old, + }, + { + name => 'newer source, target without version', + vms => [101], + target => 'unknown', + refused => qr/^node 'unknown' does not report its Proxmox VE version/, + }, + { name => 'older source, target without version', vms => [100], target => 'unknown' }, + { name => 'guest that is on the older target already', vms => [102], target => 'old2' }, + { name => 'guest that does not exist', vms => [999], target => 'old2' }, + { name => 'all guests, older target', target => 'old2', refused => $too_old }, + { name => 'all guests, newer target', target => 'new2' }, + { + name => 'all guests on older nodes, older target', + guests => { 100 => 'old1', 102 => 'old2' }, + target => 'old2', + }, + { name => 'no guests, older target', guests => {}, target => 'old2' }, +) { + subtest $case->{name} => sub { + $guests = $case->{guests} // $default_guests; + $started = 0; + + my $param = { target => $case->{target} }; + $param->{vms} = $case->{vms} if $case->{vms}; + eval { PVE::API2::Cluster::BulkAction::Guest->handle($method, $param) }; + my $err = $@; + + if (my $refused = $case->{refused}) { + like($err, $refused, 'target is refused'); + ok(!$started, 'no task is started'); + } else { + is($err, '', 'target is not refused'); + ok($started, 'task is started'); + } + }; +} + +done_testing(); diff --git a/test/Makefile b/test/Makefile index 64bf8e4e..ef9b20f2 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,7 +5,7 @@ all: export PERLLIB=.. .PHONY: check -check: test-replication test-balloon test-vzdump test-osd test-ceph-health test-ceph-services test-ceph-auth test-ceph-key-migration test-ceph-lockbox-migration test-custom-cpu-models test-pvesh test-report test-access-log test-cluster-resources test-cluster-status +check: test-replication test-balloon test-vzdump test-osd test-ceph-health test-ceph-services test-ceph-auth test-ceph-key-migration test-ceph-lockbox-migration test-custom-cpu-models test-pvesh test-report test-access-log test-cluster-resources test-cluster-status test-bulk-migrate .PHONY: test-balloon test-balloon: @@ -77,6 +77,10 @@ test-cluster-resources: test-cluster-status: ./ClusterStatus_test.pl +.PHONY: test-bulk-migrate +test-bulk-migrate: + ./BulkMigrate_test.pl + .PHONY: install install: -- 2.47.3