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

[Lorenz Stechauner]

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>
---
 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 897b4a7..bcc7722 100644
--- a/PVE/API2/Storage/Status.pm
+++ b/PVE/API2/Storage/Status.pm
@@ -446,6 +446,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);
 
@@ -464,10 +465,12 @@ __PACKAGE__->register_method ({
 				    errmsg => "mkdir failed");
  
 	    $cmd = ['/usr/bin/scp', @ssh_options, '-p', '--', $tmpfilename, "[$remip]:" . PVE::Tools::shell_quote($dest)];
+	    $err_cmd = [@remcmd, '/bin/unlink', $dest];
 	} else {
 	    PVE::Storage::activate_storage($cfg, $param->{storage});
 	    File::Path::make_path($dirname);
 	    $cmd = ['cp', '--', $tmpfilename, $dest];
+	    $err_cmd = ['/bin/unlink', $dest];
 	}
 
 	my $worker = sub {
@@ -481,7 +484,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";
-- 
2.20.1