From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v6 qemu-server 3/9] migration: test targetnode min version for cloudinit section
Date: Mon, 20 Jun 2022 12:44:56 +0200 [thread overview]
Message-ID: <20220620104502.1239272-4-aderumier@odiso.com> (raw)
In-Reply-To: <20220620104502.1239272-1-aderumier@odiso.com>
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;
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 = 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)) {
+ die "target node is too old and doesn't support new cloudinit section";
+ }
+
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
);
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};
+ 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;
--
2.30.2
next prev parent reply other threads:[~2022-06-20 10:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 10:44 [pve-devel] [PATCH v6 qemu-server 0/9] cloudinit pending behaviour change Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 1/9] qemuconfig: load_current_config : delete cloudinit value Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 2/9] vzdump : skip special:cloudinit section Alexandre Derumier
2022-06-20 10:44 ` Alexandre Derumier [this message]
2022-06-21 11:45 ` [pve-devel] [PATCH v6 qemu-server 3/9] migration: test targetnode min version for cloudinit section Fabian Ebner
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 4/9] cloudinit: add cloudinit section for current generated config Alexandre Derumier
2022-06-21 11:45 ` Fabian Ebner
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 5/9] generate cloudinit drive on offline plug Alexandre Derumier
2022-06-20 10:44 ` [pve-devel] [PATCH v6 qemu-server 6/9] cloudinit: make cloudnit options fastplug Alexandre Derumier
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 7/9] api2: add cloudinit config api Alexandre Derumier
2022-06-21 11:45 ` Fabian Ebner
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 8/9] api2: add cloudinit_update Alexandre Derumier
2022-06-20 10:45 ` [pve-devel] [PATCH v6 qemu-server 9/9] add cloudinit hotplug Alexandre Derumier
2022-06-21 11:44 ` [pve-devel] [PATCH v6 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=20220620104502.1239272-4-aderumier@odiso.com \
--to=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