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 5987B95EE2 for ; Wed, 28 Feb 2024 15:09:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76EE0E1E4 for ; Wed, 28 Feb 2024 15:09:20 +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 ; Wed, 28 Feb 2024 15:09:19 +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 BF6FA47B93 for ; Wed, 28 Feb 2024 15:02:49 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 28 Feb 2024 15:02:04 +0100 Message-Id: <20240228140226.1251979-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228140226.1251979-1-c.ebner@proxmox.com> References: <20240228140226.1251979-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [RFC proxmox-backup 14/36] client: backup: split payload to dedicated stream 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: Wed, 28 Feb 2024 14:09:49 -0000 This patch is in preparation for being able to quickly lookup metadata for previous snapshots, by splitting the upload of a pxar archive into two dedicated streams, one for metadata, being assigned a .pxar.meta.didx suffix and one for payload data, being assigned a .pxar.pld.didx suffix. The patch constructs all the required duplicate chunk stream, backup writer and upload stream instances required for the split archive uploads. This not only makes it possible reuse the payload chunks for further backup runs but keeps the metadata archive small, with the outlook of even making the currently used catalog obsolete. Signed-off-by: Christian Ebner --- pbs-client/src/pxar/create.rs | 4 + pbs-client/src/pxar_backup_stream.rs | 55 ++++++++++---- proxmox-backup-client/src/main.rs | 75 +++++++++++++++++-- .../src/proxmox_restore_daemon/api.rs | 12 ++- pxar-bin/src/main.rs | 1 + tests/catar.rs | 1 + 6 files changed, 123 insertions(+), 25 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index de8c0696..59aa4450 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -141,6 +141,7 @@ pub async fn create_archive( feature_flags: Flags, callback: F, catalog: Option>>, + mut payload_writer: Option, options: PxarCreateOptions, ) -> Result<(), Error> where @@ -171,6 +172,9 @@ where } let mut encoder = Encoder::new(&mut writer, &metadata).await?; + if let Some(writer) = payload_writer.as_mut() { + encoder = encoder.attach_payload_output(writer); + } let mut patterns = options.patterns; diff --git a/pbs-client/src/pxar_backup_stream.rs b/pbs-client/src/pxar_backup_stream.rs index 22a6ffdc..c7be4a66 100644 --- a/pbs-client/src/pxar_backup_stream.rs +++ b/pbs-client/src/pxar_backup_stream.rs @@ -40,20 +40,31 @@ impl PxarBackupStream { dir: Dir, catalog: Arc>>, options: crate::pxar::PxarCreateOptions, - ) -> Result { - let (tx, rx) = std::sync::mpsc::sync_channel(10); - + separate_payload_stream: bool, + ) -> Result<(Self, Option), Error> { let buffer_size = 256 * 1024; - let error = Arc::new(Mutex::new(None)); - let error2 = Arc::clone(&error); - let handler = async move { - let writer = TokioWriterAdapter::new(std::io::BufWriter::with_capacity( + let (tx, rx) = std::sync::mpsc::sync_channel(10); + let writer = TokioWriterAdapter::new(std::io::BufWriter::with_capacity( + buffer_size, + StdChannelWriter::new(tx), + )); + let writer = pxar::encoder::sync::StandardWriter::new(writer); + + let (payload_tx, payload_rx) = std::sync::mpsc::sync_channel(10); + let payload_writer = if separate_payload_stream { + let payload_writer = TokioWriterAdapter::new(std::io::BufWriter::with_capacity( buffer_size, - StdChannelWriter::new(tx), + StdChannelWriter::new(payload_tx), )); + Some(pxar::encoder::sync::StandardWriter::new(payload_writer)) + } else { + None + }; - let writer = pxar::encoder::sync::StandardWriter::new(writer); + let error = Arc::new(Mutex::new(None)); + let error2 = Arc::clone(&error); + let handler = async move { if let Err(err) = crate::pxar::create_archive( dir, writer, @@ -63,6 +74,7 @@ impl PxarBackupStream { Ok(()) }, Some(catalog), + payload_writer, options, ) .await @@ -76,21 +88,34 @@ impl PxarBackupStream { let future = Abortable::new(handler, registration); tokio::spawn(future); - Ok(Self { + let backup_stream = Self { rx: Some(rx), - handle: Some(handle), - error, - }) + handle: Some(handle.clone()), + error: error.clone(), + }; + + let backup_stream_payload = if separate_payload_stream { + Some(Self { + rx: Some(payload_rx), + handle: Some(handle), + error, + }) + } else { + None + }; + + Ok((backup_stream, backup_stream_payload)) } pub fn open( dirname: &Path, catalog: Arc>>, options: crate::pxar::PxarCreateOptions, - ) -> Result { + separate_payload_stream: bool, + ) -> Result<(Self, Option), Error> { let dir = nix::dir::Dir::open(dirname, OFlag::O_DIRECTORY, Mode::empty())?; - Self::new(dir, catalog, options) + Self::new(dir, catalog, options, separate_payload_stream) } } diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 256080be..f252f5b7 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -187,17 +187,24 @@ async fn backup_directory>( client: &BackupWriter, dir_path: P, archive_name: &str, + payload_target: Option<&str>, chunk_size: Option, catalog: Arc>>>>, pxar_create_options: pbs_client::pxar::PxarCreateOptions, upload_options: UploadOptions, -) -> Result { - let pxar_stream = PxarBackupStream::open(dir_path.as_ref(), catalog, pxar_create_options)?; - let mut chunk_stream = ChunkStream::new(pxar_stream, chunk_size); +) -> Result<(BackupStats, Option), Error> { if upload_options.fixed_size.is_some() { bail!("cannot backup directory with fixed chunk size!"); } + let (pxar_stream, payload_stream) = PxarBackupStream::open( + dir_path.as_ref(), + catalog, + pxar_create_options, + payload_target.is_some(), + )?; + + let mut chunk_stream = ChunkStream::new(pxar_stream, chunk_size); let (tx, rx) = mpsc::channel(10); // allow to buffer 10 chunks let stream = ReceiverStream::new(rx).map_err(Error::from); @@ -209,12 +216,46 @@ async fn backup_directory>( } }); + let stats = client.upload_stream(archive_name, stream, upload_options.clone()); - let stats = client - .upload_stream(archive_name, stream, upload_options) - .await?; + if let Some(payload_stream) = payload_stream { + let payload_target = if let Some(payload_target) = payload_target { + payload_target + } else { + bail!("got payload stream, but no target archive name"); + }; - Ok(stats) + let mut payload_chunk_stream = ChunkStream::new( + payload_stream, + chunk_size, + ); + let (payload_tx, payload_rx) = mpsc::channel(10); // allow to buffer 10 chunks + let stream = ReceiverStream::new(payload_rx).map_err(Error::from); + + // spawn payload chunker inside a separate task so that it can run parallel + tokio::spawn(async move { + while let Some(v) = payload_chunk_stream.next().await { + let _ = payload_tx.send(v).await; + } + }); + + let payload_stats = client.upload_stream( + &payload_target, + stream, + upload_options, + ); + + match futures::join!(stats, payload_stats) { + (Ok(stats), Ok(payload_stats)) => Ok((stats, Some(payload_stats))), + (Err(err), Ok(_)) => Err(format_err!("upload failed: {err}")), + (Ok(_), Err(err)) => Err(format_err!("upload failed: {err}")), + (Err(err), Err(payload_err)) => { + Err(format_err!("upload failed: {err} - {payload_err}")) + } + } + } else { + Ok((stats.await?, None)) + } } async fn backup_image>( @@ -985,6 +1026,13 @@ async fn create_backup( manifest.add_file(target, stats.size, stats.csum, crypto.mode)?; } (BackupSpecificationType::PXAR, false) => { + let metadata_mode = false; // Until enabled via param + let target = if metadata_mode { + format!("{target_base}.meta.didx") + } else { + target + }; + // start catalog upload on first use if catalog.is_none() { let catalog_upload_res = @@ -1015,16 +1063,27 @@ async fn create_backup( ..UploadOptions::default() }; - let stats = backup_directory( + let payload_target = format!("{target_base}.pld.{extension}"); + let (stats, payload_stats) = backup_directory( &client, &filename, &target, + Some(&payload_target), chunk_size_opt, catalog.clone(), pxar_options, upload_options, ) .await?; + + if let Some(payload_stats) = payload_stats { + manifest.add_file( + payload_target, + payload_stats.size, + payload_stats.csum, + crypto.mode, + )?; + } manifest.add_file(target, stats.size, stats.csum, crypto.mode)?; catalog.lock().unwrap().end_directory()?; } diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs index c2055222..bd8ddb20 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/api.rs @@ -356,8 +356,16 @@ fn extract( }; let pxar_writer = TokioWriter::new(writer); - create_archive(dir, pxar_writer, Flags::DEFAULT, |_| Ok(()), None, options) - .await + create_archive( + dir, + pxar_writer, + Flags::DEFAULT, + |_| Ok(()), + None, + None, + options, + ) + .await } .await; if let Err(err) = result { diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 2bbe90e3..e3b0faac 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -383,6 +383,7 @@ async fn create_archive( Ok(()) }, None, + None, options, ) .await?; diff --git a/tests/catar.rs b/tests/catar.rs index 36bb4f3b..04af4ffd 100644 --- a/tests/catar.rs +++ b/tests/catar.rs @@ -39,6 +39,7 @@ fn run_test(dir_name: &str) -> Result<(), Error> { Flags::DEFAULT, |_| Ok(()), None, + None, options, ))?; -- 2.39.2