From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BBD581FF13C for ; Thu, 11 Jun 2026 17:00:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0BFC4F8C1; Thu, 11 Jun 2026 17:00:09 +0200 (CEST) From: David Riley To: pve-devel@lists.proxmox.com Subject: [PATCH pve-cluster 7/9] cluster: add helpers module with version comparison functions Date: Thu, 11 Jun 2026 16:59:33 +0200 Message-ID: <20260611145935.147788-8-d.riley@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260611145935.147788-1-d.riley@proxmox.com> References: <20260611145935.147788-1-d.riley@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781189944496 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.178 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: OTL5C5EUWITABUXW3BBOUJRPTKDUSECA X-Message-ID-Hash: OTL5C5EUWITABUXW3BBOUJRPTKDUSECA X-MailFrom: d.riley@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: Move 'version_cmp' and 'pvecfg_min_version' over from qemu-server, to make them more accessible. Originally-by: Thomas Lamprecht Originally-by: Alexandre Derumier Signed-off-by: David Riley --- debian/pve-cluster.install | 1 + src/PVE/Cluster/Helpers.pm | 51 ++++++++++++++++++++++++++++++++++++++ src/PVE/Cluster/Makefile | 2 +- 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/PVE/Cluster/Helpers.pm diff --git a/debian/pve-cluster.install b/debian/pve-cluster.install index f66cd06..46d40c4 100644 --- a/debian/pve-cluster.install +++ b/debian/pve-cluster.install @@ -5,4 +5,5 @@ usr/lib/ usr/share/man/man8/pmxcfs.8 usr/share/perl5/PVE/Cluster.pm usr/share/perl5/PVE/Cluster/IPCConst.pm +usr/share/perl5/PVE/Cluster/Helpers.pm usr/share/perl5/PVE/IPCC.pm diff --git a/src/PVE/Cluster/Helpers.pm b/src/PVE/Cluster/Helpers.pm new file mode 100644 index 0000000..a4b41c9 --- /dev/null +++ b/src/PVE/Cluster/Helpers.pm @@ -0,0 +1,51 @@ +package PVE::Cluster::Helpers; + +use strict; +use warnings; + +use JSON; + +use base 'Exporter'; +our @EXPORT_OK = qw(pvecfg_min_version assert_min_cluster_version version_cmp); + +sub pvecfg_min_version { + my ($verstr, $major, $minor, $release) = @_; + + return 0 if !$verstr; + + if ($verstr =~ m/^(\d+)\.(\d+)(?:[.-](\d+))?/) { + return 1 if version_cmp($1, $major, $2, $minor, $3 // 0, $release) >= 0; + return 0; + } + + die "internal error: cannot check version of invalid string '$verstr'"; +} + +# gets in pairs the versions you want to compares, i.e.: +# ($a-major, $b-major, $a-minor, $b-minor, $a-extra, $b-extra, ...) +# returns 0 if same, -1 if $a is older than $b, +1 if $a is newer than $b +sub version_cmp { + my @versions = @_; + + my $size = scalar(@versions); + + return 0 if $size == 0; + + if ($size & 1) { + my (undef, $fn, $line) = caller(0); + die "cannot compare odd count of versions, called from $fn:$line\n"; + } + + for (my $i = 0; $i < $size; $i += 2) { + my ($left, $right) = splice(@versions, 0, 2); + $left //= 0; + $right //= 0; + + return 1 if $left > $right; + return -1 if $left < $right; + } + return 0; +} + +1; + diff --git a/src/PVE/Cluster/Makefile b/src/PVE/Cluster/Makefile index 3f920cb..db685bc 100644 --- a/src/PVE/Cluster/Makefile +++ b/src/PVE/Cluster/Makefile @@ -1,6 +1,6 @@ PVEDIR=$(DESTDIR)/usr/share/perl5/PVE -SOURCES=IPCConst.pm Setup.pm +SOURCES=Helpers.pm IPCConst.pm Setup.pm .PHONY: install install: $(SOURCES) -- 2.47.3