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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4BF18728EE for ; Fri, 2 Jul 2021 12:36:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2CD0B2F883 for ; Fri, 2 Jul 2021 12:36:04 +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 B941D2F87A for ; Fri, 2 Jul 2021 12:36:03 +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 84C0640537 for ; Fri, 2 Jul 2021 12:36:03 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 2 Jul 2021 12:35:58 +0200 Message-Id: <20210702103558.53618-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.590 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pvenode.pm] Subject: [pve-devel] [PATCH v2 manager] cli: tasks: don't treat warning 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: Fri, 02 Jul 2021 10:36:34 -0000 Signed-off-by: Fabian Ebner --- Changes from v1: * Drop already applied patches. * Drop change to exclude warnings in 'tasks' API call when errors=1. One could argue that warnings are not real errors, but in PBS, warnings are also included if errors=1, so keep it consistent with that. PVE/CLI/pvenode.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm index acd573f0..acef6c3b 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'; } } -- 2.30.2