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 3D7FC1FF389 for ; Wed, 5 Jun 2024 12:54:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 656193195D; Wed, 5 Jun 2024 12:55:00 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:54:00 +0200 Message-Id: <20240605105416.278748-43-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240605105416.278748-1-c.ebner@proxmox.com> References: <20240605105416.278748-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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v9 proxmox-backup 42/58] pxar: bin: support creation of split pxar archives via cli 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 support to create split pxar archives by redirecting the payload output to a dedicated file. Signed-off-by: Christian Ebner --- changes since version 8: - not present in previous version pxar-bin/src/main.rs | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs index 7ea5b114a..638ac00b6 100644 --- a/pxar-bin/src/main.rs +++ b/pxar-bin/src/main.rs @@ -328,6 +328,10 @@ fn extract_archive( minimum: 0, maximum: isize::MAX, }, + "payload-output": { + description: "'ppxar' payload output data file to create split archive.", + optional: true, + }, }, }, )] @@ -345,6 +349,7 @@ async fn create_archive( no_sockets: bool, exclude: Option>, entries_max: isize, + payload_output: Option, ) -> Result<(), Error> { let patterns = { let input = exclude.unwrap_or_default(); @@ -387,6 +392,16 @@ async fn create_archive( .mode(0o640) .open(archive)?; + let payload_file = payload_output + .map(|payload_output| { + OpenOptions::new() + .create_new(true) + .write(true) + .mode(0o640) + .open(payload_output) + }) + .transpose()?; + let writer = std::io::BufWriter::with_capacity(1024 * 1024, file); let mut feature_flags = Flags::DEFAULT; if no_xattrs { @@ -408,7 +423,15 @@ async fn create_archive( feature_flags.remove(Flags::WITH_SOCKETS); } - let writer = pxar::PxarVariant::Unified(pxar::encoder::sync::StandardWriter::new(writer)); + let writer = if let Some(payload_file) = payload_file { + let payload_writer = std::io::BufWriter::with_capacity(1024 * 1024, payload_file); + pxar::PxarVariant::Split( + pxar::encoder::sync::StandardWriter::new(writer), + pxar::encoder::sync::StandardWriter::new(payload_writer), + ) + } else { + pxar::PxarVariant::Unified(pxar::encoder::sync::StandardWriter::new(writer)) + }; pbs_client::pxar::create_archive( dir, PxarWriters::new(writer, None), @@ -535,7 +558,8 @@ fn main() { CliCommand::new(&API_METHOD_CREATE_ARCHIVE) .arg_param(&["archive", "source"]) .completion_cb("archive", complete_file_name) - .completion_cb("source", complete_file_name), + .completion_cb("source", complete_file_name) + .completion_cb("payload-output", complete_file_name), ) .insert( "extract", -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel