From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v4 proxmox-backup 00/10] fix catalog dump and shell for split pxar archives
Date: Mon, 21 Oct 2024 17:47:34 +0200 [thread overview]
Message-ID: <20241021154744.325556-1-c.ebner@proxmox.com> (raw)
This patch series fixes the `catalog dump` and `catalog shell`
commands for snapshots created by setting the `change-detection-mode`
to either `data` or `metadata`, therefore using split pxar archive
encoding without encoding the dedicated catalog.
If no catalog file can be found in the snaphsots manifest, the fallback
behaviour is now to check if there are metadata archives present in the
manifest, and if so use the metadata archive accessor for either
dumping the contents in a format compatible to the catalog dump or to
interactively navigate and restore contents via the catalog shell.
Changes since version 3 (thanks to Thomas for the comments and
suggestions):
- Added missing Signed-of-by trailers on path 2 and 9
- Added Suggested-by trailer for suggested code cleanups
- Extended commit message for cleanup patches, to clarify their intend
- Fixed typos in commit messages
- Renamed mentions of submodules to modules to avoid possible confusion
with git submodules
Changes since version 2 (thanks to Fabian for the comments and
suggestions):
- Move and factor out helpers to pxar/tools submodule instead of using
the tools module, which is for more generally client tools.
- Improve error handling in catalog shell by avoiding unwrap of missing
directory stack entries, bail instead.
- fix issue with factoring out of `entry_path_with_prefix` helper
- Convert to `DirEntryAttribute` by implementing the `TryFrom` trait,
replacing previous helper.
Changes since version 1:
- Implement also the `catalog shell` command for split pxar archives
- Factor out common functionality into dedicated helpers
Christian Ebner (10):
client: tools: make tools module public
client: pxar: move catalog lookup helper to pxar tools
client: tools: move pxar root entry helper to pxar module
client: make helper to get remote pxar reader reusable
client: tools: factor out entry path prefix helper
client: tools: factor out pxar entry to dir entry mapping
client: add helper to dump catalog from metadata archive
client: catalog: fallback to metadata archives for catalog dump
client: helper to mimic catalog find using metadata archive
client: catalog shell: fallback to accessor for navigation
pbs-client/src/catalog_shell.rs | 291 +++++++++++++++++++++------
pbs-client/src/pxar/extract.rs | 2 +-
pbs-client/src/pxar/mod.rs | 4 +-
pbs-client/src/pxar/tools.rs | 256 ++++++++++++++++++++++-
pbs-client/src/tools/mod.rs | 120 -----------
pbs-datastore/src/catalog.rs | 40 ++++
proxmox-backup-client/src/catalog.rs | 65 +++++-
proxmox-file-restore/src/main.rs | 38 +---
pxar-bin/src/main.rs | 4 +-
src/api2/admin/datastore.rs | 2 +-
src/api2/tape/restore.rs | 2 +-
11 files changed, 599 insertions(+), 225 deletions(-)
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2024-10-21 15:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-21 15:47 Christian Ebner [this message]
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 01/10] client: tools: make tools module public Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 02/10] client: pxar: move catalog lookup helper to pxar tools Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 03/10] client: tools: move pxar root entry helper to pxar module Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 04/10] client: make helper to get remote pxar reader reusable Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 05/10] client: tools: factor out entry path prefix helper Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 06/10] client: tools: factor out pxar entry to dir entry mapping Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 07/10] client: add helper to dump catalog from metadata archive Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 08/10] client: catalog: fallback to metadata archives for catalog dump Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 09/10] client: helper to mimic catalog find using metadata archive Christian Ebner
2024-10-21 15:47 ` [pbs-devel] [PATCH v4 proxmox-backup 10/10] client: catalog shell: fallback to accessor for navigation Christian Ebner
2024-10-23 14:13 ` [pbs-devel] applied: [PATCH v4 proxmox-backup 00/10] fix catalog dump and shell for split pxar archives Fabian Grünbichler
2024-10-23 18:37 ` Christian Ebner
2024-10-24 7:44 ` 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=20241021154744.325556-1-c.ebner@proxmox.com \
--to=c.ebner@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