[pve-devel] [PATCH manager 2/9] api/cli: tasks: don't treat warnings status as an error status

[Thomas Lamprecht]

On 12.05.21 14:32, Fabian Ebner wrote:
> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
> ---
> 
> Dependency bump for pve-common is needed.
> 
>  PVE/API2/Tasks.pm  | 5 ++++-
>  PVE/CLI/pvenode.pm | 5 ++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm
> index 8f6ab603..abae8ba3 100644
> --- a/PVE/API2/Tasks.pm
> +++ b/PVE/API2/Tasks.pm
> @@ -142,7 +142,10 @@ __PACKAGE__->register_method({
>  
>  	    return 1 if $typefilter && $task->{type} ne $typefilter;
>  
> -	    return 1 if $errors && $task->{status} && $task->{status} eq 'OK';
> +	    if ($errors && $task->{status} && !PVE::Tools::upid_status_is_error($task->{status})) {
> +		return 1;
> +	    }
> +
>  	    return 1 if $param->{vmid} && (!$task->{id} || $task->{id} ne $param->{vmid});
>  
>  	    return 1 if $count++ < $start;

Dominik is working on porting-over/implementing the more modern task filtering + UI we did for PBS,
so above hunk will go obsolete anyway so I'm going to skip this one.
Below should still be useful afterwards.

> diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm
> index a33fcd93..b05b3e15 100644
> --- a/PVE/CLI/pvenode.pm
> +++ b/PVE/CLI/pvenode.pm
> @@ -181,7 +181,10 @@ our $cmddef = {
>  	    foreach my $task (@$data) {
>  		if (!defined($task->{status})) {
>  		    $task->{status} = 'UNKNOWN';
> -		} elsif ($task->{status} ne 'OK' && $task->{status} ne 'RUNNING') {
> +		# RUNNING is set by the API call and needs to be checked explicitly
> +		} elsif (PVE::Tools::upid_status_is_error($task->{status}) &&
> +		    $task->{status} ne 'RUNNING')
> +		{
>  		    $task->{status} = 'ERROR';
>  		}
>  	    }
>