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 8C1EF1FF0B0 for ; Fri, 09 Oct 2026 15:02:22 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 51A4D21AB9; Fri, 09 Oct 2026 14:58:13 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Subject: [PATCH pve-cluster v3 31/39] cluster: move pvecfg node version helpers from qemu-server Date: Fri, 9 Oct 2026 14:56:38 +0200 Message-ID: <20261009125646.284673-32-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261009125646.284673-1-l.wagner@proxmox.com> References: <20261009125646.284673-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791550613337 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.327 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: 7KEZF2MTVL4VOUIFHHHUYYMUC3DXLTUK X-Message-ID-Hash: 7KEZF2MTVL4VOUIFHHHUYYMUC3DXLTUK X-MailFrom: l.wagner@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: From: Fiona Ebner For the pvecfg version helpers, add a node_pvecfg_version_at_least() function for convenience. In preparation to check the node version for container migration and from HA manager too. Signed-off-by: Fiona Ebner --- Notes: New in v3, cherry-picked from https://lore.proxmox.com/pve-devel/20260918160841.128088-1-f.ebner@proxmox.com/ src/PVE/Cluster.pm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index 034b78c..784ea02 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -929,4 +929,34 @@ sub cfs_rename_db_unsafe { rename $dbfile, "$dbfile.$ctime.bak" or warn "failed to rename old config database - $!\n"; } +sub get_node_pvecfg_version { + my ($node) = @_; + + my $nodes_version_info = 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 pvecfg_min_version { + my ($verstr, $major, $minor, $release) = @_; + + return 0 if !$verstr; + + if ($verstr =~ m/^(\d+)\.(\d+)(?:[.-](\d+))?/) { + return 1 if PVE::Tools::version_cmp($1, $major, $2, $minor, $3 // 0, $release) >= 0; + return 0; + } + + die "internal error: cannot check version of invalid string '$verstr'"; +} + +sub node_pvecfg_version_at_least { + my ($node, $major, $minor, $release) = @_; + + my $version = get_node_pvecfg_version($node); + return $version && pvecfg_min_version($version, $major, $minor, $release); +} + 1; -- 2.47.3