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 qemu-server v7 05/32] helpers: move get_node_pvecfg_version() version helper to pve-cluster
Date: Thu, 12 Nov 2026 12:48:37 +0100	[thread overview]
Message-ID: <20261112115001.107306-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20261112115001.107306-1-f.ebner@proxmox.com>

To prepare for pve-container to check node versions too. While at it,
switch to node_pvecfg_version_at_least() to simplify the code.

Drop the now unused JSON and PVE::Cluster imports.

Mock the new node_pvecfg_version_at_least() function for the migration
tests, to make sure that a build host which is not part of a cluster
takes the new code paths in the unit tests.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Dependency bump for pve-cluster needed!

Changes in v7:
* Drop now unused JSON and PVE::Cluster imports.
* Mock the function in the migration tests.

 src/PVE/QemuMigrate.pm           |  7 +------
 src/PVE/QemuServer/Helpers.pm    | 12 ------------
 src/test/MigrationTest/Shared.pm |  3 +++
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm
index 8176afe5..30bb98f7 100644
--- a/src/PVE/QemuMigrate.pm
+++ b/src/PVE/QemuMigrate.pm
@@ -1397,14 +1397,9 @@ sub phase2 {
         my $rpcenv = PVE::RPCEnvironment::get();
         my $authuser = $rpcenv->get_user();
 
-        my $target_version = PVE::QemuServer::Helpers::get_node_pvecfg_version($self->{node});
-
         my $ticket_port = undef;
         # Check if target is new enough for having the port encoded in the proxy ticket.
-        if (
-            $target_version
-            && PVE::Tools::pvecfg_min_version($target_version, 9, 1, 9)
-        ) {
+        if (PVE::Cluster::node_pvecfg_version_at_least($self->{node}, 9, 1, 9)) {
             $ticket_port = $spice_port;
         }
 
diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm
index ecd1944f..5efe7736 100644
--- a/src/PVE/QemuServer/Helpers.pm
+++ b/src/PVE/QemuServer/Helpers.pm
@@ -5,9 +5,7 @@ use warnings;
 
 use File::stat;
 use IO::File;
-use JSON;
 
-use PVE::Cluster;
 use PVE::INotify;
 use PVE::ProcFSTools;
 use PVE::Tools;
@@ -292,16 +290,6 @@ sub config_aware_timeout {
     return $timeout;
 }
 
-sub get_node_pvecfg_version {
-    my ($node) = @_;
-
-    my $nodes_version_info = PVE::Cluster::get_node_kv('version-info', $node);
-    return if !$nodes_version_info->{$node};
-
-    my $version_info = decode_json($nodes_version_info->{$node});
-    return $version_info->{version};
-}
-
 sub parse_number_sets {
     my ($set) = @_;
     my $res = [];
diff --git a/src/test/MigrationTest/Shared.pm b/src/test/MigrationTest/Shared.pm
index a51e1692..e29c0dd5 100644
--- a/src/test/MigrationTest/Shared.pm
+++ b/src/test/MigrationTest/Shared.pm
@@ -84,6 +84,9 @@ $cluster_module->mock(
     check_cfs_quorum => sub {
         return 1;
     },
+    node_pvecfg_version_at_least => sub {
+        return 1;
+    },
 );
 
 our $mapping_usb_module = Test::MockModule->new("PVE::Mapping::USB");
-- 
2.47.3





  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 ` Fiona Ebner [this message]
2026-11-13 12:47   ` [PATCH qemu-server v7 05/32] helpers: move get_node_pvecfg_version() version helper to pve-cluster 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 ` 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-6-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