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 3DEDD6F923 for ; Tue, 31 Aug 2021 12:17:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D6E423FD1 for ; Tue, 31 Aug 2021 12:17:20 +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 E8E6323FCD 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 B3F0A443B8 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:30 +0200 Message-Id: <20210831101637.3080902-4-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.465 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 2/4] status: remove sleep(1) in file upload 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:20 -0000 this racey sleep(1) is only there for legacy reasons: because we don't use apache anymore and only emulate its behabiour regarding removing temp files, this is under our own control now and so we can improve this whole situation. this change requires a pve-http-server version, in which the tmpfile gets not automatically removed anymore. Signed-off-by: Lorenz Stechauner --- PVE/API2/Storage/Status.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm index cc8ed5a..6493d22 100644 --- a/PVE/API2/Storage/Status.pm +++ b/PVE/API2/Storage/Status.pm @@ -500,14 +500,7 @@ __PACKAGE__->register_method ({ print "finished file import successfully\n"; }; - my $upid = $rpcenv->fork_worker('imgcopy', undef, $user, $worker); - - # apache removes the temporary file on return, so we need - # to wait here to make sure the worker process starts and - # opens the file before it gets removed. - sleep(1); - - return $upid; + return $rpcenv->fork_worker('imgcopy', undef, $user, $worker); }}); __PACKAGE__->register_method({ -- 2.30.2