From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dominik Csapak <d.csapak@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH proxmox-backup] pxar/create: handle ErrorKind::Interrupted for file reads
Date: Thu, 5 Nov 2020 10:34:37 +0100 [thread overview]
Message-ID: <20201105093437.arvjhhx5p3ksgx5l@olga.proxmox.com> (raw)
In-Reply-To: <20201105082906.24056-1-d.csapak@proxmox.com>
applied
On Thu, Nov 05, 2020 at 09:29:06AM +0100, Dominik Csapak wrote:
> they are not an error and we should retry the read
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> src/pxar/create.rs | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/pxar/create.rs b/src/pxar/create.rs
> index f4c735d0..6fe820bd 100644
> --- a/src/pxar/create.rs
> +++ b/src/pxar/create.rs
> @@ -657,7 +657,11 @@ impl<'a, 'b> Archiver<'a, 'b> {
> let mut remaining = file_size;
> let mut out = encoder.create_file(metadata, file_name, file_size)?;
> while remaining != 0 {
> - let mut got = file.read(&mut self.file_copy_buffer[..])?;
> + let mut got = match file.read(&mut self.file_copy_buffer[..]) {
> + Ok(got) => got,
> + Err(err) if err.kind() == std::io::ErrorKind::Interrupted => continue,
> + Err(err) => bail!(err),
> + };
> if got as u64 > remaining {
> self.report_file_grew_while_reading()?;
> got = remaining as usize;
> --
> 2.20.1
prev parent reply other threads:[~2020-11-05 9:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 8:29 [pbs-devel] " Dominik Csapak
2020-11-05 9:34 ` Wolfgang Bumiller [this message]
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=20201105093437.arvjhhx5p3ksgx5l@olga.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=d.csapak@proxmox.com \
--cc=pbs-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