From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id DDBED1FF0C1 for ; Fri, 18 Sep 2026 18:09:14 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id EC17E215FA; Fri, 18 Sep 2026 18:08:52 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH cluster v3 03/21] cluster: move pvecfg node version helpers from qemu-server Date: Fri, 18 Sep 2026 18:08:09 +0200 Message-ID: <20260918160841.128088-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260918160841.128088-1-f.ebner@proxmox.com> References: <20260918160841.128088-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1789747729535 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.628 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) 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: EA2WMOSANEXRI6NYJYDJRCFKQKK6IUIT X-Message-ID-Hash: EA2WMOSANEXRI6NYJYDJRCFKQKK6IUIT X-MailFrom: f.ebner@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: 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 --- New in v3. 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