From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: [pbs-devel] applied: [PATCH proxmox-backup 2/2] client: pxar: encode prelude based on writer variant
Date: Mon, 10 Jun 2024 14:06:49 +0200 [thread overview]
Message-ID: <1718020111.bnvypzw36x.astroid@yuna.none> (raw)
In-Reply-To: <20240610110621.308907-2-c.ebner@proxmox.com>
On June 10, 2024 1:06 pm, Christian Ebner wrote:
> Currently, whether to encode the exlcude patterns passed via cli as
> prelude or via the `.pxar-exclude-cli` is based on the presence of
> a previous metadata accessor.
> That leaves however to the encoding of the file entry instead of the
> prelude for split archives in `data` mode and for the first snapshot
> in a backup, creating undesired padding in the first payload chunk.
>
> Therefore, use the pxar writer variant to make the decision instead.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> pbs-client/src/pxar/create.rs | 19 +++++++++++--------
> 1 file changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs
> index dc0a31e7a..9a41bf3ee 100644
> --- a/pbs-client/src/pxar/create.rs
> +++ b/pbs-client/src/pxar/create.rs
> @@ -183,6 +183,7 @@ struct Archiver {
> previous_payload_index: Option<DynamicIndexReader>,
> cache: PxarLookaheadCache,
> reuse_stats: ReuseStats,
> + split_archive: bool,
> }
>
> type Encoder<'a, T> = pxar::encoder::aio::Encoder<'a, T>;
> @@ -247,7 +248,8 @@ where
> )?);
> }
>
> - let prelude = if options.previous_ref.is_some() && !patterns.is_empty() {
> + let split_archive = writers.archive.payload().is_some();
> + let prelude = if split_archive && !patterns.is_empty() {
> let prelude = PbsClientPrelude {
> exclude_patterns: Some(String::from_utf8(generate_pxar_excludes_cli(
> &patterns[..],
> @@ -258,7 +260,7 @@ where
> None
> };
>
> - let metadata_mode = options.previous_ref.is_some() && writers.archive.payload().is_some();
> + let metadata_mode = options.previous_ref.is_some() && split_archive;
> let (previous_payload_index, previous_metadata_accessor) =
> if let Some(refs) = options.previous_ref {
> (
> @@ -291,6 +293,7 @@ where
> previous_payload_index,
> cache: PxarLookaheadCache::new(options.max_cache_size),
> reuse_stats: ReuseStats::default(),
> + split_archive,
> };
>
> archiver
> @@ -388,12 +391,11 @@ impl Archiver {
> for file_entry in file_list {
> let file_name = file_entry.name.to_bytes();
>
> - if is_root
> - && file_name == b".pxarexclude-cli"
> - && previous_metadata_accessor.is_none()
> - {
> - self.encode_pxarexclude_cli(encoder, &file_entry.name, old_patterns_count)
> - .await?;
> + if is_root && file_name == b".pxarexclude-cli" {
> + if !self.split_archive {
> + self.encode_pxarexclude_cli(encoder, &file_entry.name, old_patterns_count)
> + .await?;
> + }
> continue;
> }
>
> @@ -1944,6 +1946,7 @@ mod tests {
> suggested_boundaries: Some(suggested_boundaries),
> cache: PxarLookaheadCache::new(None),
> reuse_stats: ReuseStats::default(),
> + split_archive: true,
> };
>
> let accessor = Accessor::new(pxar::PxarVariant::Unified(reader), metadata_size)
> --
> 2.39.2
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
>
>
>
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-06-10 12:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 11:06 [pbs-devel] [PATCH proxmox-backup 1/2] client: pxar: json encode cli exclude pattern in prelude Christian Ebner
2024-06-10 11:06 ` [pbs-devel] [PATCH proxmox-backup 2/2] client: pxar: encode prelude based on writer variant Christian Ebner
2024-06-10 12:06 ` Fabian Grünbichler [this message]
2024-06-10 12:06 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] client: pxar: json encode cli exclude pattern in prelude Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1718020111.bnvypzw36x.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox