[pve-devel] [PATCH stable-7 guest-common] storage tunnel: correctly set disk-import parameters

[Fabian Grünbichler]

do we still want to bump this? do we also want to include other recent
fixes for remote migration if we do so?

On November 29, 2024 12:54 pm, Fiona Ebner wrote:
> From: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> 
> according to the schema, else some combinations of migration / guest /
> storage settings will fail validation:
> 
> 2024-05-15 11:48:51 ERROR: migration_snapshot: type check ('boolean') failed - got ''
> 
> since this is client / source side, remote migrations to a remote node
> with validation enabled can fail without this change.
> 
> The fact that this is required for Proxmox VE 7 was reported in the
> community forum:
> https://forum.proxmox.com/threads/158202/
> 
> While Proxmox VE 7 is end-of-life since the end of July 2024, it's
> still nice to keep upgrade paths to supported versions open.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
> (cherry picked from commit 172ab9f5ccc40666478f2f83696e6b1e62090e2a)
> [FE: add rationale for backport]
> Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
> ---
>  src/PVE/StorageTunnel.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/PVE/StorageTunnel.pm b/src/PVE/StorageTunnel.pm
> index 41147dd..e6390df 100644
> --- a/src/PVE/StorageTunnel.pm
> +++ b/src/PVE/StorageTunnel.pm
> @@ -50,13 +50,13 @@ sub storage_migrate {
>      my $disk_import_opts = {
>  	format => $format,
>  	storage => $targetsid,
> -	snapshot => $snapshot,
> -	migration_snapshot => $migration_snapshot,
> +	migration_snapshot => $migration_snapshot ? 1 : 0,
>  	with_snapshots => $with_snapshots,
>  	allow_rename => !$opts->{is_vmstate},
>  	export_formats => join(",", @export_formats),
>  	volname => $name,
>      };
> +    $disk_import_opts->{snapshot} = $snapshot if $snapshot;
>      my $res = PVE::Tunnel::write_tunnel($tunnel, 600, 'disk-import', $disk_import_opts);
>      my $local = "/run/pve/$local_vmid.storage";
>      if (!$tunnel->{forwarded}->{$local}) {
> -- 
> 2.39.5
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>