From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, aderumier@odiso.com
Subject: Re: [pve-devel] [PATCH v5 qemu-server 9/9] migration: test targetnode min version for cloudinit section
Date: Wed, 8 Jun 2022 12:14:38 +0200 [thread overview]
Message-ID: <27976f13-e2e0-2205-e7ce-4712bdec305c@proxmox.com> (raw)
In-Reply-To: <20220516160719.3818057-10-aderumier@odiso.com>
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;
next prev parent reply other threads:[~2022-06-08 10:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-16 16:07 [pve-devel] [PATCH v5 qemu-server 0/9] cloudinit pending behaviour change Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 1/9] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 2/9] generate cloudinit drive on offline plug Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 3/9] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 4/9] api2: add cloudinit config api Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 5/9] api2: add cloudinit_update Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 6/9] add cloudinit hotplug Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 7/9] api2: qemu : don't display cloudinit value Alexandre Derumier
2022-06-08 10:13 ` Fabian Ebner
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 8/9] vzdump : skip special:cloudinit section Alexandre Derumier
2022-05-16 16:07 ` [pve-devel] [PATCH v5 qemu-server 9/9] migration: test targetnode min version for cloudinit section Alexandre Derumier
2022-06-08 10:14 ` Fabian Ebner [this message]
2022-06-08 10:14 ` [pve-devel] [PATCH v5 qemu-server 0/9] cloudinit pending behaviour change Fabian Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27976f13-e2e0-2205-e7ce-4712bdec305c@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox