Re: [pve-devel] [PATCH qemu-server v3 4/4] api: create: add 'import-extraction-storage' parameter

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

On April 29, 2024 1:21 pm, Dominik Csapak wrote:
> this is to override the target extraction storage for the option disk
> extraction for 'import-from'. This way if the storage does not
> supports the content type 'images', one can give an alternative  one.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  PVE/API2/Qemu.pm | 56 +++++++++++++++++++++++++++++++++++++++++-------
>  1 file changed, 48 insertions(+), 8 deletions(-)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index d32967dc..74d0e240 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -128,7 +128,9 @@ my $check_drive_param = sub {
>  };
>  
>  my $check_storage_access = sub {
> -   my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_;
> +   my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage, $extraction_storage) = @_;
> +
> +   my $needs_extraction = 0;

this is not needed

>  
>     $foreach_volume_with_alloc->($settings, sub {
>  	my ($ds, $drive) = @_;
> @@ -169,9 +171,13 @@ my $check_storage_access = sub {
>  		    if $vtype ne 'images' && $vtype ne 'import';
>  
>  		if (PVE::GuestImport::copy_needs_extraction($src_image)) {
> -		    raise_param_exc({ $ds => "$src_image is not on an storage with 'images' content type."})
> -			if !$scfg->{content}->{images};
> -		    $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
> +		    $needs_extraction = 1;
> +		    if (!defined($extraction_storage)) {
> +			raise_param_exc({ $ds => "$src_image is not on an storage with 'images'"
> +			    ." content type and no 'import-extraction-storage' was given."})
> +			    if !$scfg->{content}->{images};
> +			$rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']);
> +		    }
>  		}
>  	    }
>  
> @@ -183,6 +189,14 @@ my $check_storage_access = sub {
>  	}
>      });
>  
> +    if ($needs_extraction && defined($extraction_storage)) {
> +	my $scfg = PVE::Storage::storage_config($storecfg, $extraction_storage);
> +	raise_param_exc({ 'import-extraction-storage' => "$extraction_storage does not support"
> +		." 'images' content type or is not file based."})
> +	    if !$scfg->{content}->{images} || !$scfg->{path};
> +	$rpcenv->check($authuser, "/storage/$extraction_storage", ['Datastore.AllocateSpace']);
> +    }
> +

because this can just move up to/merged with the code where the
no-explicit-extraction-storage case is handled..

>     $rpcenv->check($authuser, "/storage/$settings->{vmstatestorage}", ['Datastore.AllocateSpace'])
>         if defined($settings->{vmstatestorage});
>  };
> @@ -326,7 +340,7 @@ my $import_from_volid = sub {
>  
>  # Note: $pool is only needed when creating a VM, because pool permissions
>  # are automatically inherited if VM already exists inside a pool.
> -my sub create_disks : prototype($$$$$$$$$$) {
> +my sub create_disks : prototype($$$$$$$$$$$) {
>      my (
>  	$rpcenv,
>  	$authuser,
> @@ -338,6 +352,7 @@ my sub create_disks : prototype($$$$$$$$$$) {
>  	$settings,
>  	$default_storage,
>  	$is_live_import,
> +	$extraction_storage,
>      ) = @_;
>  
>      my $vollist = [];
> @@ -405,7 +420,8 @@ my sub create_disks : prototype($$$$$$$$$$) {
>  		if (PVE::Storage::parse_volume_id($source, 1)) { # PVE-managed volume
>  		    if (PVE::GuestImport::copy_needs_extraction($source)) { # needs extraction beforehand
>  			print "extracting $source\n";

should we mention the storage here as well?

> -			$source = PVE::GuestImport::extract_disk_from_import_file($source, $vmid);
> +			$source = PVE::GuestImport::extract_disk_from_import_file(
> +			    $source, $vmid, $extraction_storage);
>  			print "finished extracting to $source\n";
>  			push @$delete_sources, $source;
>  		    }
> @@ -925,6 +941,12 @@ __PACKAGE__->register_method({
>  		    default => 0,
>  		    description => "Start VM after it was created successfully.",
>  		},
> +		'import-extraction-storage' => get_standard_option('pve-storage-id', {
> +		    description => "Storage to put extracted images when using 'import-from' that"
> +			." needs extraction",

something something "temporary" ;)

maybe

"Storage for temporarily extracted `import-from` image files (default:
import source storage)."

or something like that?

> +		    optional => 1,
> +		    completion => \&PVE::QemuServer::complete_storage,
> +		}),
>  	    },
>  	    1, # with_disk_alloc
>  	),
> @@ -951,6 +973,7 @@ __PACKAGE__->register_method({
>  	my $storage = extract_param($param, 'storage');
>  	my $unique = extract_param($param, 'unique');
>  	my $live_restore = extract_param($param, 'live-restore');
> +	my $extraction_storage = extract_param($param, 'import-extraction-storage');
>  
>  	if (defined(my $ssh_keys = $param->{sshkeys})) {
>  		$ssh_keys = URI::Escape::uri_unescape($ssh_keys);
> @@ -1010,7 +1033,8 @@ __PACKAGE__->register_method({
>  	if (scalar(keys $param->%*) > 0) {
>  	    &$resolve_cdrom_alias($param);
>  
> -	    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $storage);
> +	    &$check_storage_access(
> +		$rpcenv, $authuser, $storecfg, $vmid, $param, $storage, $extraction_storage);
>  
>  	    &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]);
>  
> @@ -1126,6 +1150,7 @@ __PACKAGE__->register_method({
>  			$param,
>  			$storage,
>  			$live_restore,
> +			$extraction_storage
>  		    );
>  		    $conf->{$_} = $created_opts->{$_} for keys $created_opts->%*;
>  
> @@ -1672,6 +1697,8 @@ my $update_vm_api  = sub {
>  
>      my $skip_cloud_init = extract_param($param, 'skip_cloud_init');
>  
> +    my $extraction_storage = extract_param($param, 'import-extraction-storage');
> +
>      if (defined(my $cipassword = $param->{cipassword})) {
>  	# Same logic as in cloud-init (but with the regex fixed...)
>  	$param->{cipassword} = PVE::Tools::encrypt_pw($cipassword)
> @@ -1791,7 +1818,7 @@ my $update_vm_api  = sub {
>  
>      &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]);
>  
> -    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param);
> +    &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $extraction_storage);

perl strikes again - this is missing an undef!

>  
>      PVE::QemuServer::check_bridge_access($rpcenv, $authuser, $param);
>  
> @@ -1973,6 +2000,7 @@ my $update_vm_api  = sub {
>  			{$opt => $param->{$opt}},
>  			undef,
>  			undef,
> +			$extraction_storage,
>  		    );
>  		    $conf->{pending}->{$_} = $created_opts->{$_} for keys $created_opts->%*;
>  
> @@ -2170,6 +2198,12 @@ __PACKAGE__->register_method({
>  		    maximum => 30,
>  		    optional => 1,
>  		},
> +		'import-extraction-storage' => get_standard_option('pve-storage-id', {
> +		    description => "Storage to put extracted images when using 'import-from' that"
> +			." needs extraction",

same as above..

> +		    optional => 1,
> +		    completion => \&PVE::QemuServer::complete_storage,
> +		}),
>  	    },
>  	    1, # with_disk_alloc
>  	),
> @@ -2220,6 +2254,12 @@ __PACKAGE__->register_method({
>  		    maxLength => 40,
>  		    optional => 1,
>  		},
> +		'import-extraction-storage' => get_standard_option('pve-storage-id', {
> +		    description => "Storage to put extracted images when using 'import-from' that"
> +			." needs extraction",
> +		    optional => 1,
> +		    completion => \&PVE::QemuServer::complete_storage,
> +		}),

here as well, but do we really need this here? by definition the PUT
variant is wrong for such a use case..

>  	    },
>  	    1, # with_disk_alloc
>  	),
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel