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 EDF136F933 for ; Tue, 31 Aug 2021 12:17:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDFA123FFA for ; Tue, 31 Aug 2021 12:17:19 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DBF8423FC4 for ; Tue, 31 Aug 2021 12:17:15 +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 A67F94438B for ; Tue, 31 Aug 2021 12:17:15 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Tue, 31 Aug 2021 12:16:29 +0200 Message-Id: <20210831101637.3080902-3-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210831101637.3080902-1-l.stechauner@proxmox.com> References: <20210831101637.3080902-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.468 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. [status.pm] Subject: [pve-devel] [PATCH v4 storage 1/4] status: move unlink from http-server to enpoint 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: Tue, 31 Aug 2021 10:17:50 -0000 this is the first step in which not the http server removes the temporary file, but the worker itself. Signed-off-by: Lorenz Stechauner --- PVE/API2/Storage/Status.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index b838461..cc8ed5a 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -486,6 +486,12 @@ __PACKAGE__->register_method ({ print "command: " . join(' ', @$cmd) . "\n"; eval { run_command($cmd, errmsg => 'import failed'); }; + + # unlinks only the temporary file from the http server + unlink $tmpfilename; + warn "unable to clean up temporary file '$tmpfilename' - $!\n" + if $! && $! != ENOENT; + if (my $err = $@) { eval { $err_cleanup->() }; warn "$@" if $@; -- 2.30.2