From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 72CA61FF38E for ; Tue, 7 May 2024 18:01:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A8636130E7; Tue, 7 May 2024 18:01:29 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 7 May 2024 17:52:22 +0200 Message-Id: <20240507155244.793819-41-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 40/62] client: chunk stream: add struct to hold injection state 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" Adds a dedicated structure to hold the optional sender and receiver instances and state for injection of reused dynamic entries in the payload stream for split stream pxar archives. The asynchronous channels must only be attached to the payload archive, leaving the current behaviour for the metadata archive and current default encoding without reusing payload chunks of previous snapshots. Signed-off-by: Christian Ebner --- changes since version 4: - no changes pbs-client/src/chunk_stream.rs | 23 +++++++++++++++++++++++ pbs-client/src/lib.rs | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/pbs-client/src/chunk_stream.rs b/pbs-client/src/chunk_stream.rs index 895f6eae2..83c75ba28 100644 --- a/pbs-client/src/chunk_stream.rs +++ b/pbs-client/src/chunk_stream.rs @@ -1,4 +1,5 @@ use std::pin::Pin; +use std::sync::mpsc; use std::task::{Context, Poll}; use anyhow::Error; @@ -8,6 +9,28 @@ use futures::stream::{Stream, TryStream}; use pbs_datastore::Chunker; +use crate::inject_reused_chunks::InjectChunks; + +/// Holds the queues for optional injection of reused dynamic index entries +pub struct InjectionData { + boundaries: mpsc::Receiver, + injections: mpsc::Sender, + consumed: u64, +} + +impl InjectionData { + pub fn new( + boundaries: mpsc::Receiver, + injections: mpsc::Sender, + ) -> Self { + Self { + boundaries, + injections, + consumed: 0, + } + } +} + /// Split input stream into dynamic sized chunks pub struct ChunkStream { input: S, diff --git a/pbs-client/src/lib.rs b/pbs-client/src/lib.rs index 3e7bd2a8b..3d2da27b9 100644 --- a/pbs-client/src/lib.rs +++ b/pbs-client/src/lib.rs @@ -39,6 +39,6 @@ mod backup_specification; pub use backup_specification::*; mod chunk_stream; -pub use chunk_stream::{ChunkStream, FixedChunkStream}; +pub use chunk_stream::{ChunkStream, FixedChunkStream, InjectionData}; pub const PROXMOX_BACKUP_TCP_KEEPALIVE_TIME: u32 = 120; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel