Signed-off-by: Alexandre Derumier <aderum...@odiso.com> --- 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 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel