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 AD0AAE56D for ; Tue, 26 Sep 2023 09:11:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8F379358C6 for ; Tue, 26 Sep 2023 09:11:27 +0200 (CEST) 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 ; Tue, 26 Sep 2023 09:11:26 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A4C504469C for ; Tue, 26 Sep 2023 09:11:26 +0200 (CEST) Date: Tue, 26 Sep 2023 09:11:25 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Message-ID: <1767667467.4698.1695712285399@webmail.proxmox.com> In-Reply-To: <20230922071621.12670-21-c.ebner@proxmox.com> References: <20230922071621.12670-1-c.ebner@proxmox.com> <20230922071621.12670-21-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev50 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.101 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: Re: [pbs-devel] [RFC proxmox-backup 20/20] fix #3174: client: Add incremental flag to backup creation 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: Tue, 26 Sep 2023 07:11:27 -0000 As discussed off list with Fabian and Thomas, the naming choice for the flag is not okay, as the term "incremental" is already taken in Proxmox Backup Server context and only might lead to confusion. Further, it might be useful to extend from the flag to a more structured option including parameters in the future, so `--change-detection-mode ` was suggested by Thomas as is states a clear change in functionality. A new version of the patch series will include this change in naming. > On 22.09.2023 09:16 CEST Christian Ebner wrote: > > > When set, the catalog for the previous backup run and the corresponding > index file are fetched from the server and used as reference during pxar > archive creation. > This allows the archiver to skip encoding of file payloads for unchanged > regular files and referencing their existing chunks to be included in the > new backups index file instead, creating a pxar archive with appendix > section containing the payloads as concatenation of chunks. > > Signed-off-by: Christian Ebner > --- > proxmox-backup-client/src/main.rs | 107 ++++++++++++++++++++++++++++-- > 1 file changed, 103 insertions(+), 4 deletions(-) > > diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs > index 5945ae5d..90c73a55 100644 > --- a/proxmox-backup-client/src/main.rs > +++ b/proxmox-backup-client/src/main.rs > @@ -1,5 +1,6 @@ > use std::collections::{HashSet, VecDeque}; > use std::io::{self, Read, Seek, SeekFrom, Write}; > +use std::os::unix::fs::OpenOptionsExt; > use std::path::{Path, PathBuf}; > use std::pin::Pin; > use std::sync::{Arc, Mutex}; > @@ -687,6 +688,12 @@ fn spawn_catalog_upload( > optional: true, > default: false, > }, > + "incremental": { > + type: Boolean, > + description: "Only read files modified since last full-backup.", > + optional: true, > + default: false, > + }, > } > } > )] > @@ -696,6 +703,7 @@ async fn create_backup( > all_file_systems: bool, > skip_lost_and_found: bool, > dry_run: bool, > + incremental: bool, > _info: &ApiMethod, > _rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > @@ -849,7 +857,17 @@ async fn create_backup( > > let backup_time = backup_time_opt.unwrap_or_else(epoch_i64); > > - let client = connect_rate_limited(&repo, rate_limit)?; > + let client = connect_rate_limited(&repo, rate_limit.clone())?; > + let backup_group = BackupGroup::new(backup_type, backup_id); > + > + let previous_snapshot = if incremental { > + let snapshot = > + api_datastore_latest_snapshot(&client, &repo.store(), &backup_ns, backup_group).await?; > + Some(snapshot) > + } else { > + None > + }; > + > record_repository(&repo); > > let snapshot = BackupDir::from((backup_type, backup_id.to_owned(), backup_time)); > @@ -959,8 +977,8 @@ async fn create_backup( > log::info!("{} {} '{}' to '{}' as {}", what, desc, file, repo, target); > }; > > - for (backup_type, filename, target, size) in upload_list { > - match (backup_type, dry_run) { > + for (backup_spec_type, filename, target, size) in upload_list { > + match (backup_spec_type, dry_run) { > // dry-run > (BackupSpecificationType::CONFIG, true) => log_file("config file", &filename, &target), > (BackupSpecificationType::LOGFILE, true) => log_file("log file", &filename, &target), > @@ -1010,12 +1028,44 @@ async fn create_backup( > .unwrap() > .start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?; > > + let known_chunks = Arc::new(Mutex::new(HashSet::new())); > + let previous_ref = if incremental { > + match previous_manifest { > + None => None, > + Some(ref manifest) => { > + let reference_index = client > + .download_previous_dynamic_index( > + &target, > + &manifest, > + known_chunks.clone(), > + ) > + .await?; > + > + let reference_catalog = download_reference_catalog( > + &repo, > + previous_snapshot.as_ref().unwrap(), > + &backup_ns, > + crypt_config.clone(), > + ) > + .await?; > + > + Some(pbs_client::pxar::PxarPrevRef { > + index: reference_index, > + catalog: reference_catalog, > + archive_name: target.clone(), > + }) > + } > + } > + } else { > + None > + }; > + > let pxar_options = pbs_client::pxar::PxarCreateOptions { > device_set: devices.clone(), > patterns: pattern_list.clone(), > entries_max: entries_max as usize, > skip_lost_and_found, > - previous_ref: None, > + previous_ref, > }; > > let upload_options = UploadOptions { > @@ -1116,6 +1166,55 @@ async fn create_backup( > Ok(Value::Null) > } > > +async fn download_reference_catalog( > + repo: &BackupRepository, > + previous_snapshot: &BackupDir, > + backup_ns: &BackupNamespace, > + crypt_config: Option>, > +) -> Result, Error> { > + let http_reader_client = connect(&repo)?; > + let backup_reader = BackupReader::start( > + http_reader_client, > + crypt_config.clone(), > + repo.store(), > + &backup_ns, > + &previous_snapshot, > + true, > + ) > + .await?; > + > + let (manifest, _) = backup_reader.download_manifest().await?; > + manifest.check_fingerprint(crypt_config.as_ref().map(Arc::as_ref))?; > + > + let index = backup_reader > + .download_dynamic_index(&manifest, CATALOG_NAME) > + .await?; > + let most_used = index.find_most_used_chunks(8); > + let file_info = manifest.lookup_file_info(CATALOG_NAME)?; > + > + let chunk_reader = RemoteChunkReader::new( > + backup_reader, > + crypt_config.clone(), > + file_info.chunk_crypt_mode(), > + most_used, > + ); > + > + let mut reader = BufferedDynamicReader::new(index, chunk_reader); > + > + let mut catalogfile = std::fs::OpenOptions::new() > + .write(true) > + .read(true) > + .custom_flags(libc::O_TMPFILE) > + .open("/tmp")?; > + > + std::io::copy(&mut reader, &mut catalogfile) > + .map_err(|err| format_err!("failed to download reference catalog - {}", err))?; > + > + catalogfile.seek(SeekFrom::Start(0))?; > + > + Ok(CatalogReader::new(catalogfile)) > +} > + > async fn dump_image( > client: Arc, > crypt_config: Option>, > -- > 2.39.2