From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 97FA670440
for <pve-devel@lists.proxmox.com>; Tue, 21 Jun 2022 13:45:18 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8DA214B15
for <pve-devel@lists.proxmox.com>; Tue, 21 Jun 2022 13:45:18 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id EBCA24B04
for <pve-devel@lists.proxmox.com>; Tue, 21 Jun 2022 13:45:17 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BBA2A43C3D;
Tue, 21 Jun 2022 13:45:17 +0200 (CEST)
Message-ID: <61470ea4-a2ab-4547-70d3-93f333faa1f9@proxmox.com>
Date: Tue, 21 Jun 2022 13:45:16 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
Thunderbird/91.9.0
Content-Language: en-US
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
References: <20220620104502.1239272-1-aderumier@odiso.com>
<20220620104502.1239272-4-aderumier@odiso.com>
From: Fabian Ebner <f.ebner@proxmox.com>
In-Reply-To: <20220620104502.1239272-4-aderumier@odiso.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.047 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
NICE_REPLY_A -0.001 Looks like a legit reply (A)
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [qemumigrate.pm, helpers.pm]
Subject: Re: [pve-devel] [PATCH v6 qemu-server 3/9] migration: test
targetnode min version for cloudinit section
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2022 11:45:18 -0000
Am 20.06.22 um 12:44 schrieb Alexandre Derumier:
> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
> ---
> PVE/QemuMigrate.pm | 10 +++++++++-
> PVE/QemuServer/Helpers.pm | 26 ++++++++++++++++++++++++++
> 2 files changed, 35 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index d52dc8d..e594564 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -5,6 +5,7 @@ use warnings;
>
> use IO::File;
> use IPC::Open2;
> +use JSON;
Not used anymore in v6.
> use POSIX qw( WNOHANG );
> use Time::HiRes qw( usleep );
>
> @@ -23,7 +24,7 @@ use PVE::Tunnel;
> use PVE::QemuConfig;
> use PVE::QemuServer::CPUConfig;
> use PVE::QemuServer::Drive;
> -use PVE::QemuServer::Helpers qw(min_version);
> +use PVE::QemuServer::Helpers qw(min_version version_cmp);
Same.
> use PVE::QemuServer::Machine;
> use PVE::QemuServer::Monitor qw(mon_cmd);
> use PVE::QemuServer;
> @@ -122,6 +123,13 @@ sub prepare {
> # test if VM exists
> my $conf = $self->{vmconf} = PVE::QemuConfig->load_config($vmid);
>
> + my $version = PVE::QemuServer::Helpers::get_node_pvecfg_version($self->{node});
> + my $cloudinit_config = $conf->{cloudinit};
> +
> + if(defined($cloudinit_config) && keys %$cloudinit_config && !PVE::QemuServer::Helpers::pvecfg_min_version($version, 7, 2, 4)) {
Version should be 7, 2, 5 (since currently released pve-manager 7.2-4
would already pass this).
Style nit: missing space after if, line too long
> + die "target node is too old and doesn't support new cloudinit section";
missing newline in error.
> + }
> +
> my $repl_conf = PVE::ReplicationConfig->new();
> $self->{replication_jobcfg} = $repl_conf->find_local_replication_job($vmid, $self->{node});
> $self->{is_replicated} = $repl_conf->check_for_existing_jobs($vmid, 1);
> diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm
> index c10d842..c9d6b64 100644
> --- a/PVE/QemuServer/Helpers.pm
> +++ b/PVE/QemuServer/Helpers.pm
> @@ -4,6 +4,7 @@ use strict;
> use warnings;
>
> use File::stat;
> +use JSON;
>
> use PVE::INotify;
> use PVE::ProcFSTools;
> @@ -12,6 +13,7 @@ use base 'Exporter';
> our @EXPORT_OK = qw(
> min_version
> config_aware_timeout
> +version_cmp
No need for the new export in v6.
> );
>
> my $nodename = PVE::INotify::nodename();
> @@ -161,4 +163,28 @@ 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_json = $nodes_version_info->{$node};
Style nit: no need for this temporary variable.
> + my $version_info = decode_json($version_info_json);
> + 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 version_cmp($1, $major, $2, $minor, $3, $release) >= 0;
> + return 0;
> + }
> +
> + die "internal error: cannot check version of invalid string '$verstr'";
> +}
> +
> 1;