From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 1C7F770B7B for ; Mon, 16 May 2022 18:08:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4486F1F9CE for ; Mon, 16 May 2022 18:07:32 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 0168F1F935 for ; Mon, 16 May 2022 18:07:28 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 45035159CD; Mon, 16 May 2022 18:07:21 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 43B7A14DCC2; Mon, 16 May 2022 18:07:21 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 16 May 2022 18:07:19 +0200 Message-Id: <20220516160719.3818057-10-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220516160719.3818057-1-aderumier@odiso.com> References: <20220516160719.3818057-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 9/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 16:08:30 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuMigrate.pm | 36 +++++++++++++++++++++++++++++++++++- PVE/QemuServer/Helpers.pm | 1 + 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index d52dc8d..29a03e9 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -5,6 +5,7 @@ use warnings; use IO::File; use IPC::Open2; +use JSON; 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); 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 = get_node_pvecfg_version($self->{node}); + my $cloudinit_config = $conf->{cloudinit}; + + if(defined($cloudinit_config) && keys %$cloudinit_config && !pvecfg_min_version($version, 7, 2, 4)) { + die "target node is too old and don't support new cloudinit format"; + } + 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); @@ -1284,4 +1292,30 @@ sub round_powerof2 { return 2 << int(log($_[0]-1)/log(2)); } +sub get_node_pvecfg_version { + my ($node) = @_; + + my $nodes_version_info = PVE::Cluster::get_node_kv('version-info'); + my $version = undef; + if($nodes_version_info->{$node}) { + my $version_info_json = $nodes_version_info->{$node}; + my $version_info = decode_json($version_info_json); + $version = $version_info->{version} if $version_info->{version}; + } + return $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; diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm index c10d842..017a56c 100644 --- a/PVE/QemuServer/Helpers.pm +++ b/PVE/QemuServer/Helpers.pm @@ -12,6 +12,7 @@ use base 'Exporter'; our @EXPORT_OK = qw( min_version config_aware_timeout +version_cmp ); my $nodename = PVE::INotify::nodename(); -- 2.30.2