[pve-devel] [PATCH v2 storage] api: status: fix unlink on file upload

[Lorenz Stechauner]

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 <l.stechauner at proxmox.com>
> ---
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";