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 54B856BCB4 for ; Mon, 14 Dec 2020 14:41:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5105E16874 for ; Mon, 14 Dec 2020 14:41:50 +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 C58081685E for ; Mon, 14 Dec 2020 14:41:48 +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 91108450F0 for ; Mon, 14 Dec 2020 14:41:48 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 14 Dec 2020 14:41:47 +0100 Message-Id: <20201214134147.8832-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201214134147.8832-1-d.csapak@proxmox.com> References: <20201214134147.8832-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.284 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/1] pxar/extract: if possible create files sparesly 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: Mon, 14 Dec 2020 13:41:50 -0000 instead of filling them with zeroes this fixes an issue where we could not restore a container with large sparse files in the backup (e.g. a 10GiB sparse file in a container with a 8GiB disk) Signed-off-by: Dominik Csapak --- src/pxar/extract.rs | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/pxar/extract.rs b/src/pxar/extract.rs index ed238a2c..dd084ead 100644 --- a/src/pxar/extract.rs +++ b/src/pxar/extract.rs @@ -18,7 +18,10 @@ use pxar::format::Device; use pxar::Metadata; use proxmox::c_result; -use proxmox::tools::fs::{create_path, CreateOptions}; +use proxmox::tools::{ + fs::{create_path, CreateOptions}, + io::{sparse_copy, sparse_copy_async} +}; use crate::pxar::dir_stack::PxarDirStack; use crate::pxar::metadata; @@ -392,6 +395,11 @@ impl Extractor { ) }; + let copy_sparse = match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) { + Ok(_) => true, + Err(_) => false, + }; + metadata::apply_initial_flags( self.feature_flags, metadata, @@ -399,8 +407,12 @@ impl Extractor { &mut self.on_error, )?; - let extracted = io::copy(&mut *contents, &mut file) - .map_err(|err| format_err!("failed to copy file contents: {}", err))?; + let extracted = if copy_sparse { + sparse_copy(&mut *contents, &mut file) + } else { + io::copy(&mut *contents, &mut file) + }.map_err(|err| format_err!("failed to copy file contents: {}", err))?; + if size != extracted { bail!("extracted {} bytes of a file of {} bytes", extracted, size); } @@ -434,6 +446,11 @@ impl Extractor { ) }); + let copy_sparse = match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) { + Ok(_) => true, + Err(_) => false, + }; + metadata::apply_initial_flags( self.feature_flags, metadata, @@ -441,9 +458,12 @@ impl Extractor { &mut self.on_error, )?; - let extracted = tokio::io::copy(&mut *contents, &mut file) - .await - .map_err(|err| format_err!("failed to copy file contents: {}", err))?; + let extracted = if copy_sparse { + sparse_copy_async(&mut *contents, &mut file).await + } else { + tokio::io::copy(&mut *contents, &mut file).await + }.map_err(|err| format_err!("failed to copy file contents: {}", err))?; + if size != extracted { bail!("extracted {} bytes of a file of {} bytes", extracted, size); } -- 2.20.1