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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5017E65D90 for ; Thu, 5 Nov 2020 10:34:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E15E15D53 for ; Thu, 5 Nov 2020 10:34:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DBAE015D49 for ; Thu, 5 Nov 2020 10:34:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A3F3345E6B for ; Thu, 5 Nov 2020 10:34:37 +0100 (CET) Date: Thu, 5 Nov 2020 10:34:37 +0100 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20201105093437.arvjhhx5p3ksgx5l@olga.proxmox.com> References: <20201105082906.24056-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201105082906.24056-1-d.csapak@proxmox.com> User-Agent: NeoMutt/20180716 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [create.rs] Subject: [pbs-devel] applied: [PATCH proxmox-backup] pxar/create: handle ErrorKind::Interrupted for file reads X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2020 09:34:38 -0000 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 > --- > 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