public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup v2] datastore: don't skip empty namespaces on s3 refresh
Date: Thu,  5 Mar 2026 10:20:32 +0100	[thread overview]
Message-ID: <20260305092032.29058-1-h.laimer@proxmox.com> (raw)

Without this empty namespaces present on s3 won't be visible locally.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
v2, thanks @Fabian:
 - don't duplicate dir creation, just move ns check to after dir
   creation since it is identicaly for namespaces and other things

 pbs-datastore/src/datastore.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 7ad3d917..76b66f7d 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -2534,11 +2534,6 @@ impl DataStore {
                 let object_path = object_path.strip_prefix(&store_prefix).with_context(|| {
                     format!("failed to strip store context prefix {store_prefix} for {object_key}")
                 })?;
-                if object_path.ends_with(NAMESPACE_MARKER_FILENAME) {
-                    continue;
-                }
-
-                info!("Fetching object {object_path}");
 
                 let file_path = tmp_base.join(object_path);
                 if let Some(parent) = file_path.parent() {
@@ -2549,6 +2544,13 @@ impl DataStore {
                     )?;
                 }
 
+                if object_path.ends_with(NAMESPACE_MARKER_FILENAME) {
+                    info!("Created namespace {object_path}");
+                    continue;
+                } else {
+                    info!("Fetching object {object_path}");
+                }
+
                 let mut target_file = tokio::fs::OpenOptions::new()
                     .write(true)
                     .create(true)
-- 
2.47.3





             reply	other threads:[~2026-03-05  9:19 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-05  9:20 Hannes Laimer [this message]
2026-03-05  9:32 ` Hannes Laimer
2026-03-05  9:53   ` Fabian Grünbichler
2026-03-05  9:49 ` 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=20260305092032.29058-1-h.laimer@proxmox.com \
    --to=h.laimer@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal