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 9E7F868825 for ; Thu, 22 Jul 2021 09:05:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 90B20DFC2 for ; Thu, 22 Jul 2021 09:05:22 +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 17137DFB3 for ; Thu, 22 Jul 2021 09:05:22 +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 D78E642593 for ; Thu, 22 Jul 2021 09:05:21 +0200 (CEST) To: Lorenz Stechauner , Proxmox VE development discussion References: <20210625072240.1031850-1-l.stechauner@proxmox.com> From: Lorenz Stechauner Message-ID: Date: Thu, 22 Jul 2021 09:05:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210625072240.1031850-1-l.stechauner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.628 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.117 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 v2 storage] api: status: fix unlink on 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: Thu, 22 Jul 2021 07:05:22 -0000 ping On 25.06.21 09:22, Lorenz Stechauner wrote: > after an error while copying the file to its destination the local > path of the destination was unlinked in every case, even when on the > destination was copied to via scp. > > Signed-off-by: Lorenz Stechauner > --- changes to v1: * using 'unlink' instead of '/usr/bin/unlink' * using '--' now > PVE/API2/Storage/Status.pm | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm > index 72fd851..b4d2e15 100644 > --- a/PVE/API2/Storage/Status.pm > +++ b/PVE/API2/Storage/Status.pm > @@ -444,6 +444,7 @@ __PACKAGE__->register_method ({ > # we simply overwrite the destination file if it already exists > > my $cmd; > + my $err_cmd; > if ($node ne 'localhost' && $node ne PVE::INotify::nodename()) { > my $remip = PVE::Cluster::remote_node_ip($node); > > @@ -462,10 +463,12 @@ __PACKAGE__->register_method ({ > errmsg => "mkdir failed"); > > $cmd = ['/usr/bin/scp', @ssh_options, '-p', '--', $tmpfilename, "[$remip]:" . PVE::Tools::shell_quote($dest)]; > + $err_cmd = [@remcmd, 'unlink', '--', $dest]; > } else { > PVE::Storage::activate_storage($cfg, $param->{storage}); > File::Path::make_path($dirname); > $cmd = ['cp', '--', $tmpfilename, $dest]; > + $err_cmd = ['unlink', '--', $dest]; > } > > my $worker = sub { > @@ -479,7 +482,7 @@ __PACKAGE__->register_method ({ > > eval { PVE::Tools::run_command($cmd, errmsg => 'import failed'); }; > if (my $err = $@) { > - unlink $dest; > + eval { PVE::Tools::run_command($err_cmd); }; > die $err; > } > print "finished file import successfully\n";