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 3AC107EE31 for ; Thu, 11 Nov 2021 16:18:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 26AB9E4C1 for ; Thu, 11 Nov 2021 16:17:52 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B40F3E49A for ; Thu, 11 Nov 2021 16:17:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8018B44B63 for ; Thu, 11 Nov 2021 16:17:50 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Nov 2021 16:17:45 +0100 Message-Id: <20211111151745.130818-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111151745.130818-1-f.ebner@proxmox.com> References: <20211111151745.130818-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.191 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 Subject: [pve-devel] [PATCH manager 3/3] jobs: rename function to better distinguish job state and task 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, 11 Nov 2021 15:18:22 -0000 Also, default to 'internal error' if the task status within the lock is undef, which shouldn't actually be possible. Signed-off-by: Fabian Ebner --- PVE/Jobs.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/PVE/Jobs.pm b/PVE/Jobs.pm index bfccf7f1..b91d6158 100644 --- a/PVE/Jobs.pm +++ b/PVE/Jobs.pm @@ -54,7 +54,7 @@ sub lock_job_state { return $res; } -my $get_job_status = sub { +my $get_job_task_status = sub { my ($state) = @_; if (!defined($state->{upid})) { @@ -82,17 +82,15 @@ sub update_job_stopped { my $state = read_job_state($jobid, $type); return if !defined($state) || $state->{state} ne 'started'; # removed or not started - if (defined($get_job_status->($state))) { + if (defined($get_job_task_status->($state))) { lock_job_state($jobid, $type, sub { my $state = read_job_state($jobid, $type); return if !defined($state) || $state->{state} ne 'started'; # removed or not started - my $status = $get_job_status->($state); - my $new_state = { state => 'stopped', - msg => $status, - upid => $state->{upid} + msg => $get_job_task_status->($state) // 'internal error', + upid => $state->{upid}, }; if ($state->{updated}) { # save updated time stamp -- 2.30.2