From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0825B7556A for ; Thu, 24 Jun 2021 09:07:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F02C612398 for ; Thu, 24 Jun 2021 09:06:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7D1401238A for ; Thu, 24 Jun 2021 09:06:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 52E6246785 for ; Thu, 24 Jun 2021 09:06:57 +0200 (CEST) Message-ID: Date: Thu, 24 Jun 2021 09:06:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:90.0) Gecko/20100101 Thunderbird/90.0 Content-Language: en-US To: Proxmox VE development discussion , Fabian Ebner References: <20210512123258.28178-1-f.ebner@proxmox.com> <20210512123258.28178-3-f.ebner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20210512123258.28178-3-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.640 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH manager 2/9] api/cli: tasks: don't treat warnings status as an error status X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 07:07:33 -0000 On 12.05.21 14:32, Fabian Ebner wrote: > Signed-off-by: Fabian Ebner > --- > > 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'; > } > } >