From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH v8 proxmox-backup 64/69] client: pxar: allow to restore prelude to optional path
Date: Mon, 03 Jun 2024 15:57:35 +0200 [thread overview]
Message-ID: <1717421421.rzd54jizb2.astroid@yuna.none> (raw)
In-Reply-To: <20240528094303.309806-65-c.ebner@proxmox.com>
On May 28, 2024 11:42 am, Christian Ebner wrote:
> Pxar archives allow to store additional information in a prelude
> entry since pxar format version 2.
>
> Add an optional parameter to `pxar` and `proxmox-backup-client` to
> specify the path to restore the prelude to and pass this to the
> archive extraction by extending the `PxarExtractOptions` by a
> corresponding field. If none is given, the prelude is simply skipped
> during restore.
>
> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
> ---
> changes since version 7:
> - no changes
>
> changes since version 6:
> - remove binding to now not returned version return value
>
> pbs-client/src/pxar/extract.rs | 23 +++++++++++++++++++++--
> proxmox-backup-client/src/main.rs | 12 +++++++++++-
> pxar-bin/src/main.rs | 6 ++++++
> 3 files changed, 38 insertions(+), 3 deletions(-)
>
> diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
> index e22390606..99c0d0e10 100644
> --- a/pbs-client/src/pxar/extract.rs
> +++ b/pbs-client/src/pxar/extract.rs
> @@ -2,7 +2,8 @@
>
> use std::collections::HashMap;
> use std::ffi::{CStr, CString, OsStr, OsString};
> -use std::io;
> +use std::fs::OpenOptions;
> +use std::io::{self, Write};
> use std::os::unix::ffi::OsStrExt;
> use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
> use std::path::{Path, PathBuf};
> @@ -37,6 +38,7 @@ pub struct PxarExtractOptions<'a> {
> pub allow_existing_dirs: bool,
> pub overwrite_flags: OverwriteFlags,
> pub on_error: Option<ErrorHandler>,
> + pub prelude_path: Option<PathBuf>,
> }
>
> bitflags! {
> @@ -125,9 +127,26 @@ where
> // we use this to keep track of our directory-traversal
> decoder.enable_goodbye_entries(true);
>
> - let (root, _) = handle_root_with_optional_format_version_prelude(&mut decoder)
> + let (root, prelude) = handle_root_with_optional_format_version_prelude(&mut decoder)
> .context("error reading pxar archive")?;
>
> + if let Some(ref path) = options.prelude_path {
> + if let Some(entry) = prelude {
> + let mut prelude_file = OpenOptions::new()
> + .create(true)
> + .write(true)
> + .open(path)
> + .with_context(|| format!("error creating prelude file '{path:?}'"))?;
> + if let pxar::EntryKind::Prelude(ref prelude) = entry.kind() {
> + prelude_file.write_all(prelude.as_os_str().as_bytes())?;
> + } else {
> + log::info!("unexpected entry kind for prelude");
> + }
> + } else {
> + log::info!("No prelude entry found, skip prelude restore.");
> + }
> + }
> +
> if !root.is_dir() {
> bail!("pxar archive does not start with a directory entry!");
> }
> diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
> index 87dbb63d5..ad9042857 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -1433,7 +1433,12 @@ We do not extract '.pxar' archives when writing to standard output.
> description: "ignore errors that occur during device node extraction",
> optional: true,
> default: false,
> - }
> + },
> + "restore-prelude-to": {
> + description: "Path to restore prelude to, (pxar v2 archives only).",
> + type: String,
> + optional: true,
> + },
I don't think we have any other CLI parameters that follow this pattern,
maybe something like
--prelude-target
is a better fit?
and in any case, it's lacking completion :)
> }
> }
> )]
> @@ -1595,12 +1600,17 @@ async fn restore(
> overwrite_flags.insert(pbs_client::pxar::OverwriteFlags::all());
> }
>
> + let prelude_path = param["restore-prelude-to"]
> + .as_str()
> + .map(|path| PathBuf::from(path));
> +
> let options = pbs_client::pxar::PxarExtractOptions {
> match_list: &[],
> extract_match_default: true,
> allow_existing_dirs,
> overwrite_flags,
> on_error,
> + prelude_path,
> };
>
> let mut feature_flags = pbs_client::pxar::Flags::DEFAULT;
> diff --git a/pxar-bin/src/main.rs b/pxar-bin/src/main.rs
> index 8040e5ff4..6aa7d21f0 100644
> --- a/pxar-bin/src/main.rs
> +++ b/pxar-bin/src/main.rs
> @@ -131,6 +131,10 @@ fn extract_archive_from_reader<R: std::io::Read>(
> description: "'ppxar' payload input data file to restore split archive.",
> optional: true,
> },
> + "restore-prelude-to": {
> + description: "Path to restore pxar archive prelude to.",
> + optional: true,
> + },
same applies here
> },
> },
> )]
> @@ -154,6 +158,7 @@ fn extract_archive(
> no_sockets: bool,
> strict: bool,
> payload_input: Option<String>,
> + restore_prelude_to: Option<String>,
> ) -> Result<(), Error> {
> let mut feature_flags = Flags::DEFAULT;
> if no_xattrs {
> @@ -227,6 +232,7 @@ fn extract_archive(
> overwrite_flags,
> extract_match_default,
> on_error,
> + prelude_path: restore_prelude_to.map(|path| PathBuf::from(path)),
> };
>
> if archive == "-" {
> --
> 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-03 13:57 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 9:41 [pbs-devel] [PATCH v8 pxar proxmox-backup 00/69] fix #3174: improve file-level backup Christian Ebner
2024-05-28 9:41 ` [pbs-devel] [PATCH v8 pxar 01/69] decoder: factor out skip part from skip_entry Christian Ebner
2024-05-28 9:41 ` [pbs-devel] [PATCH v8 pxar 02/69] lib: add type for input/output variant differentiation Christian Ebner
2024-05-28 9:41 ` [pbs-devel] [PATCH v8 pxar 03/69] encoder: move to stack based state tracking Christian Ebner
2024-05-28 9:41 ` [pbs-devel] [PATCH v8 pxar 04/69] format/examples: add header type `PXAR_PAYLOAD_REF` Christian Ebner
2024-05-28 9:41 ` [pbs-devel] [PATCH v8 pxar 05/69] decoder: add method to read payload references Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 06/69] encoder: allow split output writer for archive creation Christian Ebner
2024-05-29 11:54 ` Dominik Csapak
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 07/69] decoder/accessor: allow for split input stream variant Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 08/69] decoder: set payload input range when decoding via accessor Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 09/69] encoder: add payload reference capability Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 10/69] encoder: add payload position capability Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 11/69] encoder: add payload advance capability Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 12/69] encoder/format: finish payload stream with marker Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 13/69] format: add payload stream start marker Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 14/69] format/encoder/decoder: new pxar entry type `Version` Christian Ebner
2024-06-03 11:25 ` Fabian Grünbichler
2024-06-03 11:54 ` Christian Ebner
2024-06-03 12:10 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 pxar 15/69] format/encoder/decoder: new pxar entry type `Prelude` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 16/69] client: backup: factor out extension from backup target Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 17/69] api: datastore: refactor getting local chunk reader Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 18/69] client: pxar: switch to stack based encoder state Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 19/69] client: pxar: combine writers into struct Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 20/69] client: pxar: optionally split metadata and payload streams Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 21/69] client: helper: add helpers for creating reader instances Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 22/69] client: helper: add method for split archive name mapping Christian Ebner
2024-06-04 8:17 ` Fabian Grünbichler
2024-06-04 8:30 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 23/69] client: tools: helper to check pxar filename extensions Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 24/69] client: restore: read payload from dedicated index Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 25/69] tools: cover extension for split pxar archives Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 26/69] restore: " Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 27/69] client: mount: make split pxar archives mountable Christian Ebner
2024-06-04 8:24 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 28/69] api: datastore: attach split archive payload chunk reader Christian Ebner
2024-06-04 8:26 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 29/69] catalog: shell: make split pxar archives accessible Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 30/69] www: cover metadata extension for pxar archives Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 31/69] file restore: factor out getting pxar reader Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 32/69] file restore: cover split metadata and payload archives Christian Ebner
2024-06-04 8:28 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 33/69] file restore: show more error context when extraction fails Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 34/69] pxar: add optional payload input for archive restore Christian Ebner
2024-06-03 13:23 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 35/69] pxar: cover listing for split archives Christian Ebner
2024-06-03 13:27 ` Fabian Grünbichler
2024-06-03 13:36 ` Christian Ebner
2024-06-03 14:54 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 36/69] pxar: add more context to extraction error Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 37/69] client: pxar: include payload offset in entry listing Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 38/69] pxar: show padding in debug output on archive list Christian Ebner
2024-06-04 8:34 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 39/69] datastore: dynamic index: add method to get digest Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 40/69] client: pxar: helper for lookup of reusable dynamic entries Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 41/69] upload stream: implement reused chunk injector Christian Ebner
2024-06-04 8:50 ` Fabian Grünbichler
2024-06-04 8:58 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 42/69] client: chunk stream: add struct to hold injection state Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 43/69] chunker: add method to reset chunker state Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 44/69] client: streams: add channels for dynamic entry injection Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 45/69] specs: add backup detection mode specification Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 46/69] client: implement prepare reference method Christian Ebner
2024-06-04 9:24 ` Fabian Grünbichler
2024-06-04 12:45 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 47/69] client: pxar: add method for metadata comparison Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 48/69] pxar: caching: add look-ahead cache Christian Ebner
2024-06-04 9:35 ` Fabian Grünbichler
2024-06-04 13:58 ` Christian Ebner
2024-06-05 10:56 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 49/69] client: pxar: refactor catalog encoding for directories Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 50/69] fix #3174: client: pxar: enable caching and meta comparison Christian Ebner
2024-06-04 11:50 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 51/69] client: backup writer: add injected chunk count to stats Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 52/69] pxar: create: keep track of reused chunks and files Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 53/69] pxar: create: show chunk injection stats debug output Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 54/69] client: pxar: add helper to handle optional preludes Christian Ebner
2024-06-04 11:55 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 55/69] client: pxar: opt encode cli exclude patterns as Prelude Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 56/69] pxar: ignore version and prelude entries in listing Christian Ebner
2024-06-04 8:39 ` Fabian Grünbichler
2024-06-04 8:48 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 57/69] docs: file formats: describe split pxar archive file layout Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 58/69] docs: add section describing change detection mode Christian Ebner
2024-06-04 12:07 ` Fabian Grünbichler
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 59/69] test-suite: add detection mode change benchmark Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 60/69] test-suite: Makefile: add debian package and related files Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 61/69] datastore: chunker: add Chunker trait Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 62/69] datastore: chunker: implement chunker for payload stream Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 63/69] client: chunk stream: switch payload stream chunker Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 64/69] client: pxar: allow to restore prelude to optional path Christian Ebner
2024-06-03 13:57 ` Fabian Grünbichler [this message]
2024-06-03 15:02 ` Christian Ebner
2024-05-28 9:42 ` [pbs-devel] [PATCH v8 proxmox-backup 65/69] client: pxar: add archive creation with reference test Christian Ebner
2024-05-28 9:43 ` [pbs-devel] [PATCH v8 proxmox-backup 66/69] client: tools: add helper to raise nofile rlimit Christian Ebner
2024-05-28 9:43 ` [pbs-devel] [PATCH v8 proxmox-backup 67/69] client: pxar: set cache limit based on " Christian Ebner
2024-05-28 9:43 ` [pbs-devel] [PATCH v8 proxmox-backup 68/69] chunker: tests: add regression tests for payload chunker Christian Ebner
2024-05-28 9:43 ` [pbs-devel] [PATCH v8 proxmox-backup 69/69] chunk stream: " Christian Ebner
2024-05-31 10:40 ` [pbs-devel] [PATCH v8 pxar proxmox-backup 00/69] fix #3174: improve file-level backup Dominik Csapak
2024-05-31 11:19 ` Christian Ebner
2024-06-05 8:51 ` [pbs-devel] partially-applied: " 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=1717421421.rzd54jizb2.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