From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 736941FF38F
for <inbox@lore.proxmox.com>; Tue, 21 May 2024 14:27:02 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 886F0181F3;
Tue, 21 May 2024 14:27:19 +0200 (CEST)
Message-ID: <2d13c1c7-6a86-44c6-8261-087f4ab64ef0@proxmox.com>
Date: Tue, 21 May 2024 14:26:45 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird Beta
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>, Christian Ebner <c.ebner@proxmox.com>
References: <20240514103421.289431-1-c.ebner@proxmox.com>
<20240514103421.289431-21-c.ebner@proxmox.com>
Content-Language: en-US
From: Dominik Csapak <d.csapak@proxmox.com>
In-Reply-To: <20240514103421.289431-21-c.ebner@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.016 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: Re: [pbs-devel] [PATCH v6 proxmox-backup 20/65] client: helper: add
helpers for creating reader instances
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
there are a few clippy warnings, comments inline:
On 5/14/24 12:33, Christian Ebner wrote:
> Add module to place helper methods which need to be used in different
> submodules of the client.
>
> Add `get_pxar_fuse_reader`, `get_buffered_pxar_reader` and
> `get_pxar_fuse_accessor` to create reader instances to access pxar
> archives.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> proxmox-backup-client/src/helper.rs | 75 +++++++++++++++++++++++++++++
> proxmox-backup-client/src/main.rs | 2 +
> 2 files changed, 77 insertions(+)
> create mode 100644 proxmox-backup-client/src/helper.rs
>
> diff --git a/proxmox-backup-client/src/helper.rs b/proxmox-backup-client/src/helper.rs
> new file mode 100644
> index 000000000..00b3ce362
> --- /dev/null
> +++ b/proxmox-backup-client/src/helper.rs
> @@ -0,0 +1,75 @@
> +use std::sync::Arc;
> +
> +use anyhow::Error;
> +use pbs_client::{BackupReader, RemoteChunkReader};
> +use pbs_datastore::BackupManifest;
> +use pbs_tools::crypt_config::CryptConfig;
> +
> +use crate::{BufferedDynamicReadAt, BufferedDynamicReader, IndexFile};
> +
> +pub(crate) async fn get_pxar_fuse_accessor(
> + archive_name: &str,
> + payload_archive_name: Option<&str>,
> + client: Arc<BackupReader>,
> + manifest: &BackupManifest,
> + crypt_config: Option<Arc<CryptConfig>>,
> +) -> Result<pbs_pxar_fuse::Accessor, Error> {
> + let (reader, archive_size) = get_pxar_fuse_reader(
> + &archive_name,
the reference is not needed, 'archive_name' is already a reference
> + client.clone(),
> + &manifest,
here too
> + crypt_config.clone(),
> + )
> + .await?;
> +
> + let accessor = if let Some(payload_archive_name) = payload_archive_name {
> + let (payload_reader, payload_size) = get_pxar_fuse_reader(
> + payload_archive_name,
> + client.clone(),
> + &manifest,
here too
> + crypt_config.clone(),
> + )
> + .await?;
> + pbs_pxar_fuse::Accessor::new(reader, archive_size, Some((payload_reader, payload_size)))
> + .await?
> + } else {
> + pbs_pxar_fuse::Accessor::new(reader, archive_size, None).await?
> + };
> +
> + Ok(accessor)
> +}
> +
> +pub(crate) async fn get_pxar_fuse_reader(
> + archive_name: &str,
> + client: Arc<BackupReader>,
> + manifest: &BackupManifest,
> + crypt_config: Option<Arc<CryptConfig>>,
> +) -> Result<(pbs_pxar_fuse::Reader, u64), Error> {
> + let reader = get_buffered_pxar_reader(archive_name, client, manifest, crypt_config).await?;
> + let archive_size = reader.archive_size();
> + let reader: pbs_pxar_fuse::Reader = Arc::new(BufferedDynamicReadAt::new(reader));
> +
> + Ok((reader, archive_size))
> +}
> +
> +pub(crate) async fn get_buffered_pxar_reader(
> + archive_name: &str,
> + client: Arc<BackupReader>,
> + manifest: &BackupManifest,
> + crypt_config: Option<Arc<CryptConfig>>,
> +) -> Result<BufferedDynamicReader<RemoteChunkReader>, Error> {
> + let index = client
> + .download_dynamic_index(&manifest, &archive_name)
here too
> + .await?;
> +
> + let most_used = index.find_most_used_chunks(8);
> + let file_info = manifest.lookup_file_info(&archive_name)?;
here too
> + let chunk_reader = RemoteChunkReader::new(
> + client.clone(),
> + crypt_config.clone(),
> + file_info.chunk_crypt_mode(),
> + most_used,
> + );
> +
> + Ok(BufferedDynamicReader::new(index, chunk_reader))
> +}
> diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
> index ab7d316d4..b81719dad 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -72,6 +72,8 @@ mod catalog;
> pub use catalog::*;
> mod snapshot;
> pub use snapshot::*;
> +mod helper;
> +pub(crate) use helper::*;
> pub mod key;
> pub mod namespace;
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel