From: Christian Ebner <c.ebner@proxmox.com>
To: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>,
"Proxmox Backup Server development discussion"
<pbs-devel@lists.proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup 6/8] file-restore: fallback to mpxar if catalog not present
Date: Fri, 7 Jun 2024 13:41:51 +0200 [thread overview]
Message-ID: <e689c8f8-7bd2-458c-a4d7-fa4d4fc3b5de@proxmox.com> (raw)
In-Reply-To: <1717759984.sjo4bnbn57.astroid@yuna.none>
On 6/7/24 13:35, Fabian Grünbichler wrote:
> On June 7, 2024 12:43 pm, Christian Ebner wrote:
>> On 6/7/24 12:32, Fabian Grünbichler wrote:
>>> On June 7, 2024 11:43 am, Christian Ebner wrote:
>>>> The `proxmox-file-restore list` command will uses the provided path to
>>>> lookup and list directory entries via the catalog. Fallback to using
>>>> the metadata archive if the catalog is not present for fast lookups in
>>>> a backup snapshot.
>>>>
>>>> This is in preparation for dropping encoding of the catalog for
>>>> snapshots using split archive encoding. Proxmox VE's storage plugin
>>>> uses this to allow single file restore for LXCs.
>>>>
>>>> Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
>>>> ---
>>>> proxmox-file-restore/src/main.rs | 72 +++++++++++++++++++++++++-------
>>>> 1 file changed, 56 insertions(+), 16 deletions(-)
>>>>
>>>> diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
>>>> index 38cc1ce85..a09873467 100644
>>>> --- a/proxmox-file-restore/src/main.rs
>>>> +++ b/proxmox-file-restore/src/main.rs
>>>> @@ -124,7 +124,8 @@ async fn list_files(
>>>> ExtractPath::ListArchives => {
>>>> let mut entries = vec![];
>>>> for file in manifest.files() {
>>>> - if !has_pxar_filename_extension(&file.filename, true)
>>>> + if !file.filename.ends_with(".pxar.didx")
>>>> + && !file.filename.ends_with(".mpxar.didx")
>>>> && !file.filename.ends_with(".img.fidx")
>>>
>>> is this hunk here stray? or why do we now list regular pxar files here
>>> but didn't before? this seems unrelated to the rest of this patch?
>>
>> This makes sure that the `.mpxar` is not listed as archive, e.g. when
>> accessing the snapshot via the Proxmox VE file browser. (Please note the
>> negation).
>>
>> But I will split this off into a single patch, adding some context as
>> commit message.
>
> but the previous version using the helper had the same effect of not
> listing mpxar archives, the only difference is that thew new variant
> does list ppxar ones?
No, it skips over them, so ppxar are not listed anymore while pxar,
mpxar and img are... (not clear without the code context).
_______________________________________________
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-07 11:41 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-07 9:43 [pbs-devel] [PATCH proxmox-backup 0/8] drop catalog encoding for split pxar archives Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 1/8] api: datastore: factor out path decoding for catalog Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 2/8] api: datastore: move reusable code out of thread Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 3/8] client: tools: add helper to lookup `ArchiveEntry`s via pxar Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 4/8] api: datastore: conditional lookup for catalog endpoint Christian Ebner
2024-06-07 10:23 ` Fabian Grünbichler
2024-06-07 10:34 ` Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 5/8] api: datastore: add optional archive-name to file-restore Christian Ebner
2024-06-07 10:24 ` Fabian Grünbichler
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 6/8] file-restore: fallback to mpxar if catalog not present Christian Ebner
2024-06-07 10:32 ` Fabian Grünbichler
2024-06-07 10:43 ` Christian Ebner
2024-06-07 11:35 ` Fabian Grünbichler
2024-06-07 11:41 ` Christian Ebner [this message]
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 7/8] www: content: lookup via metadata archive instead of catalog Christian Ebner
2024-06-07 9:43 ` [pbs-devel] [PATCH proxmox-backup 8/8] client: backup: conditionally write catalog for file level backups Christian Ebner
2024-06-07 10:48 ` 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=e689c8f8-7bd2-458c-a4d7-fa4d4fc3b5de@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal