From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: Lorenz Stechauner <l.stechauner@proxmox.com>,
Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH v2 storage] api: status: fix unlink on file upload
Date: Thu, 22 Jul 2021 09:05:20 +0200 [thread overview]
Message-ID: <bc261485-b024-7f9b-a1c0-de6fec5daf73@proxmox.com> (raw)
In-Reply-To: <20210625072240.1031850-1-l.stechauner@proxmox.com>
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@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";
next prev parent reply other threads:[~2021-07-22 7:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 7:22 Lorenz Stechauner
2021-07-22 7:05 ` Lorenz Stechauner [this message]
2021-07-29 15:14 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bc261485-b024-7f9b-a1c0-de6fec5daf73@proxmox.com \
--to=l.stechauner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox