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 50C0E71216 for ; Wed, 8 Jun 2022 12:15:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47E2868E4 for ; Wed, 8 Jun 2022 12:14:40 +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 B3A6568D9 for ; Wed, 8 Jun 2022 12:14:39 +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 8A24F43693; Wed, 8 Jun 2022 12:14:39 +0200 (CEST) Message-ID: <27976f13-e2e0-2205-e7ce-4712bdec305c@proxmox.com> Date: Wed, 8 Jun 2022 12:14:38 +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: <20220516160719.3818057-1-aderumier@odiso.com> <20220516160719.3818057-10-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20220516160719.3818057-10-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.926 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 -1.732 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 - Subject: Re: [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: Wed, 08 Jun 2022 10:15:10 -0000 Am 16.05.22 um 18:07 schrieb Alexandre Derumier: > @@ -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)) { Just to note: version here is for pve-manger and needs to be adapted upon applying. Also requires a dependency bump, so that having new pve-manager ensures having new qemu-server. > + die "target node is too old and don't support new cloudinit format"; s/don't/doesn't/ s/format/section/ missing newline > + } > + > 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)); > } > These two helpers are better added in PVE::QemuServer::Helpers (or could even be moved to guest-common or pve-cluster together with version_cmp). > +sub get_node_pvecfg_version { > + my ($node) = @_; > + > + my $nodes_version_info = PVE::Cluster::get_node_kv('version-info'); Also passing the node to get_node_kv() avoids needlessly requesting the info for all nodes. > + 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; Style nit: should be tabs here. > + } > + > + die "internal error: cannot check version of invalid string '$verstr'"; > +} > + > 1;