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 587E5BC38C for ; Thu, 28 Mar 2024 13:46:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3516EAF18 for ; Thu, 28 Mar 2024 13:46:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Thu, 28 Mar 2024 13:46:49 +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 B1B5B42984 for ; Thu, 28 Mar 2024 13:37:45 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 13:36:51 +0100 Message-Id: <20240328123707.336951-43-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328123707.336951-1-c.ebner@proxmox.com> References: <20240328123707.336951-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 v3 proxmox-backup 42/58] client: implement prepare reference method 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, 28 Mar 2024 12:46:50 -0000 Implement a method that prepares the decoder instance to access a previous snapshots metadata index and payload index in order to pass it to the pxar archiver. The archiver than can utilize these to compare the metadata for files to the previous state and gather reusable chunks. Signed-off-by: Christian Ebner --- changes since version 2: - moved checks for reader and mainifest to call side as suggested - distinguish between previous manifest not having index and error state pbs-client/src/pxar/create.rs | 14 +++++++- pbs-client/src/pxar/mod.rs | 2 +- proxmox-backup-client/src/main.rs | 57 +++++++++++++++++++++++++++++-- 3 files changed, 69 insertions(+), 4 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 2c7867f22..335e3556f 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -19,6 +19,7 @@ use nix::sys::stat::{FileStat, Mode}; use pathpatterns::{MatchEntry, MatchFlag, MatchList, MatchType, PatternFlag}; use pbs_datastore::index::IndexFile; use proxmox_sys::error::SysError; +use pxar::accessor::aio::Accessor; use pxar::encoder::{LinkOffset, SeqWrite}; use pxar::Metadata; @@ -26,8 +27,9 @@ use proxmox_io::vec; use proxmox_lang::c_str; use proxmox_sys::fs::{self, acl, xattr}; +use crate::RemoteChunkReader; use pbs_datastore::catalog::BackupCatalogWriter; -use pbs_datastore::dynamic_index::DynamicIndexReader; +use pbs_datastore::dynamic_index::{DynamicIndexReader, LocalDynamicReadAt}; use crate::inject_reused_chunks::InjectChunks; use crate::pxar::metadata::errno_is_unsupported; @@ -49,6 +51,16 @@ pub struct PxarCreateOptions { pub skip_e2big_xattr: bool, } +/// Statefull information of previous backups snapshots for partial backups +pub struct PxarPrevRef { + /// Reference accessor for metadata comparison + pub accessor: Accessor>, + /// Reference index for reusing payload chunks + pub payload_index: DynamicIndexReader, + /// Reference archive name for partial backups + pub archive_name: String, +} + fn detect_fs_type(fd: RawFd) -> Result { let mut fs_stat = std::mem::MaybeUninit::uninit(); let res = unsafe { libc::fstatfs(fd, fs_stat.as_mut_ptr()) }; diff --git a/pbs-client/src/pxar/mod.rs b/pbs-client/src/pxar/mod.rs index b7dcf8362..76652094e 100644 --- a/pbs-client/src/pxar/mod.rs +++ b/pbs-client/src/pxar/mod.rs @@ -56,7 +56,7 @@ pub(crate) mod tools; mod flags; pub use flags::Flags; -pub use create::{create_archive, PxarCreateOptions, PxarWriters}; +pub use create::{create_archive, PxarCreateOptions, PxarPrevRef, PxarWriters}; pub use extract::{ create_tar, create_zip, extract_archive, extract_sub_dir, extract_sub_dir_seq, ErrorHandler, OverwriteFlags, PxarExtractContext, PxarExtractOptions, diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 215095ee7..0b747453c 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -21,6 +21,7 @@ use proxmox_router::{cli::*, ApiMethod, RpcEnvironment}; use proxmox_schema::api; use proxmox_sys::fs::{file_get_json, image_size, replace_file, CreateOptions}; use proxmox_time::{epoch_i64, strftime_local}; +use pxar::accessor::aio::Accessor; use pxar::accessor::{MaybeReady, ReadAt, ReadAtOperation}; use pbs_api_types::{ @@ -30,7 +31,7 @@ use pbs_api_types::{ BACKUP_TYPE_SCHEMA, TRAFFIC_CONTROL_BURST_SCHEMA, TRAFFIC_CONTROL_RATE_SCHEMA, }; use pbs_client::catalog_shell::Shell; -use pbs_client::pxar::ErrorHandler as PxarErrorHandler; +use pbs_client::pxar::{ErrorHandler as PxarErrorHandler, PxarPrevRef}; use pbs_client::tools::{ complete_archive_name, complete_auth_id, complete_backup_group, complete_backup_snapshot, complete_backup_source, complete_chunk_size, complete_group_or_snapshot, @@ -50,7 +51,7 @@ use pbs_client::{ }; use pbs_datastore::catalog::{BackupCatalogWriter, CatalogReader, CatalogWriter}; use pbs_datastore::chunk_store::verify_chunk_size; -use pbs_datastore::dynamic_index::{BufferedDynamicReader, DynamicIndexReader}; +use pbs_datastore::dynamic_index::{BufferedDynamicReader, DynamicIndexReader, LocalDynamicReadAt}; use pbs_datastore::fixed_index::FixedIndexReader; use pbs_datastore::index::IndexFile; use pbs_datastore::manifest::{ @@ -1177,6 +1178,58 @@ async fn create_backup( Ok(Value::Null) } +async fn prepare_reference( + target: &str, + manifest: Arc, + backup_writer: &BackupWriter, + backup_reader: Arc, + crypt_config: Option>, +) -> Result, Error> { + let (target, payload_target) = helper::get_pxar_archive_names(target); + let payload_target = payload_target.unwrap_or_default(); + + let metadata_ref_index = if let Ok(index) = backup_reader + .download_dynamic_index(&manifest, &target) + .await + { + index + } else { + log::info!("No previous metadata index, continue without reference"); + return Ok(None); + }; + + if let Err(_err) = manifest.lookup_file_info(&payload_target) { + log::info!("No previous payload index found in manifest, continue without reference"); + return Ok(None); + } + + let known_payload_chunks = Arc::new(Mutex::new(HashSet::new())); + let payload_ref_index = backup_writer + .download_previous_dynamic_index(&payload_target, &manifest, known_payload_chunks) + .await?; + + log::info!("Using previous index as metadata reference for '{target}'"); + + let most_used = metadata_ref_index.find_most_used_chunks(8); + let file_info = manifest.lookup_file_info(&target)?; + let chunk_reader = RemoteChunkReader::new( + backup_reader.clone(), + crypt_config.clone(), + file_info.chunk_crypt_mode(), + most_used, + ); + let reader = BufferedDynamicReader::new(metadata_ref_index, chunk_reader); + let archive_size = reader.archive_size(); + let reader = LocalDynamicReadAt::new(reader); + let accessor = Accessor::new(reader, archive_size, None).await?; + + Ok(Some(pbs_client::pxar::PxarPrevRef { + accessor, + payload_index: payload_ref_index, + archive_name: target, + })) +} + async fn dump_image( client: Arc, crypt_config: Option>, -- 2.39.2