[pve-devel] [PATCH qemu-server v5 4/6] api: migrate preconditions: use new check_local_resources info

[Wolfgang Bumiller]

On Tue, Jun 06, 2023 at 03:52:05PM +0200, Dominik Csapak wrote:
> for offline migration, limit the allowed nodes to the ones where the
> mapped resources are available
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  PVE/API2/Qemu.pm | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 038bb1d4..3da08318 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -4332,7 +4332,11 @@ __PACKAGE__->register_method({
>  
>  	$res->{running} = PVE::QemuServer::check_running($vmid) ? 1:0;
>  
> -	# if vm is not running, return target nodes where local storage is available
> +	my ($local_resources, $mapped_resources, $not_allowed_nodes) =

^ as in 3/6

> +	    PVE::QemuServer::check_local_resources($vmconf, 1);
> +	delete $not_allowed_nodes->{$localnode};
> +
> +	# if vm is not running, return target nodes where local storage/mapped devices are available
>  	# for offline migration
>  	if (!$res->{running}) {
>  	    $res->{allowed_nodes} = [];
> @@ -4340,7 +4344,12 @@ __PACKAGE__->register_method({
>  	    delete $checked_nodes->{$localnode};
>  
>  	    foreach my $node (keys %$checked_nodes) {
> -		if (!defined $checked_nodes->{$node}->{unavailable_storages}) {
> +		if (scalar($not_allowed_nodes->{$node}->@*)) {

maybe pull the node entry into a variable and reuse it below

> +		    $checked_nodes->{$node}->{unavailable_resources} = $not_allowed_nodes->{$node};
> +		    next;
> +		}
> +
> +		if (!defined($checked_nodes->{$node}->{unavailable_storages})) {
>  		    push @{$res->{allowed_nodes}}, $node;
>  		}
>  
> @@ -4348,13 +4357,11 @@ __PACKAGE__->register_method({
>  	    $res->{not_allowed_nodes} = $checked_nodes;

^ now I'm confused

>  	}
>  
> -
>  	my $local_disks = &$check_vm_disks_local($storecfg, $vmconf, $vmid);
>  	$res->{local_disks} = [ values %$local_disks ];;
>  
> -	my $local_resources =  PVE::QemuServer::check_local_resources($vmconf, 1);
> -
>  	$res->{local_resources} = $local_resources;
> +	$res->{mapped_resources} = $mapped_resources;
>  
>  	return $res;
>  
> -- 
> 2.30.2