From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 4132D1FF39F for ; Tue, 7 May 2024 18:01:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D02AA13243; Tue, 7 May 2024 18:01:55 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 7 May 2024 17:52:26 +0200 Message-Id: <20240507155244.793819-45-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240507155244.793819-1-c.ebner@proxmox.com> References: <20240507155244.793819-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 v5 proxmox-backup 44/62] client: pxar: add method for metadata comparison 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Add method to compare metadata of current file entry against metadata of the entry looked up in the previous backup snapshot. If the metadata matched, the start offset pointing to the files payload header in the payload steam is returned. This is in preparation for reusing payload chunks for unchanged files. Signed-off-by: Christian Ebner --- changes since version 4: - refactor to `MetadataArchiveReader` type, reusable by tests with local accessor pbs-client/src/pxar/create.rs | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 3248fd307..7e6402de5 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -2,6 +2,7 @@ use std::collections::{HashMap, HashSet}; use std::ffi::{CStr, CString, OsStr}; use std::fmt; use std::io::{self, Read}; +use std::mem::size_of; use std::ops::Range; use std::os::unix::ffi::OsStrExt; use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, OwnedFd, RawFd}; @@ -21,7 +22,7 @@ use proxmox_sys::error::SysError; use pxar::accessor::aio::{Accessor, Directory}; use pxar::accessor::ReadAt; use pxar::encoder::{LinkOffset, SeqWrite}; -use pxar::Metadata; +use pxar::{EntryKind, Metadata}; use proxmox_io::vec; use proxmox_lang::c_str; @@ -344,6 +345,37 @@ impl Archiver { .boxed() } + async fn is_reusable_entry( + &mut self, + previous_metadata_accessor: &mut Directory, + file_name: &Path, + metadata: &Metadata, + ) -> Result>, Error> { + if let Some(file_entry) = previous_metadata_accessor.lookup(file_name).await? { + if metadata == file_entry.metadata() { + if let EntryKind::File { + payload_offset: Some(offset), + size, + .. + } = file_entry.entry().kind() + { + let range = *offset..*offset + size + size_of::() as u64; + log::debug!( + "reusable: {file_name:?} at range {range:?} has unchanged metadata." + ); + return Ok(Some(range)); + } + log::debug!("reencode: {file_name:?} not a regular file."); + return Ok(None); + } + log::debug!("reencode: {file_name:?} metadata did not match."); + return Ok(None); + } + + log::debug!("reencode: {file_name:?} not found in previous archive."); + Ok(None) + } + /// openat() wrapper which allows but logs `EACCES` and turns `ENOENT` into `None`. /// /// The `existed` flag is set when iterating through a directory to note that we know the file -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel