From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup 5/6] datastore: open datastores with WriteNonExpanding instead of Write
Date: Tue, 2 Jun 2026 14:59:01 +0200 [thread overview]
Message-ID: <20260602130001.217482-11-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260602130001.217482-1-r.obkircher@proxmox.com>
Allow reclaim and garbage-collection jobs when the GarbageCollection
maintenance mode is active. Only include the most important operations
for now. Others, such as set_backup_owner and group/namespace moves,
could be reasonably supported as well.
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
src/api2/admin/datastore.rs | 12 ++++++------
src/api2/admin/namespace.rs | 2 +-
src/bin/proxmox-backup-proxy.rs | 2 +-
src/server/prune_job.rs | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 3cbdd8922..a08531e41 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -253,7 +253,7 @@ pub async fn delete_group(
&auth_id,
PRIV_DATASTORE_MODIFY,
PRIV_DATASTORE_PRUNE,
- Operation::Write,
+ Operation::WriteNonExpanding,
&group,
)?;
@@ -463,7 +463,7 @@ pub async fn delete_snapshot(
&auth_id,
PRIV_DATASTORE_MODIFY,
PRIV_DATASTORE_PRUNE,
- Operation::Write,
+ Operation::WriteNonExpanding,
&backup_dir.group,
)?;
@@ -1002,7 +1002,7 @@ pub fn prune(
&auth_id,
PRIV_DATASTORE_MODIFY,
PRIV_DATASTORE_PRUNE,
- Operation::Write,
+ Operation::WriteNonExpanding,
&group,
)?;
@@ -1174,7 +1174,7 @@ pub fn prune_datastore(
true,
)?;
- let datastore = DataStore::lookup_datastore(lookup_with(&store, Operation::Write))?;
+ let datastore = DataStore::lookup_datastore(lookup_with(&store, Operation::WriteNonExpanding))?;
let ns = prune_options.ns.clone().unwrap_or_default();
let worker_id = format!("{store}:{ns}");
@@ -1212,7 +1212,7 @@ pub fn start_garbage_collection(
_info: &ApiMethod,
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
- let datastore = DataStore::lookup_datastore(lookup_with(&store, Operation::Write))?;
+ let datastore = DataStore::lookup_datastore(lookup_with(&store, Operation::WriteNonExpanding))?;
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let job = Job::new("garbage_collection", &store)
@@ -2307,7 +2307,7 @@ pub async fn set_protection(
&auth_id,
PRIV_DATASTORE_MODIFY,
PRIV_DATASTORE_BACKUP,
- Operation::Write,
+ Operation::WriteNonExpanding,
&backup_dir.group,
)?;
diff --git a/src/api2/admin/namespace.rs b/src/api2/admin/namespace.rs
index 19e1e8cd0..10ac69259 100644
--- a/src/api2/admin/namespace.rs
+++ b/src/api2/admin/namespace.rs
@@ -168,7 +168,7 @@ pub fn delete_namespace(
check_ns_modification_privs(&store, &ns, &auth_id)?;
- let lookup = crate::tools::lookup_with(&store, Operation::Write);
+ let lookup = crate::tools::lookup_with(&store, Operation::WriteNonExpanding);
let datastore = DataStore::lookup_datastore(lookup)?;
let (removed_all, stats) = datastore.remove_namespace_recursive(&ns, delete_groups)?;
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index b372f779e..ec5f24efb 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -598,7 +598,7 @@ async fn schedule_datastore_garbage_collection() {
Err(_) => continue, // could not get lock
};
- let lookup = lookup_with(&store, Operation::Write);
+ let lookup = lookup_with(&store, Operation::WriteNonExpanding);
let datastore = match DataStore::lookup_datastore(lookup) {
Ok(datastore) => datastore,
Err(err) => {
diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs
index 03661127e..aa6e4e73e 100644
--- a/src/server/prune_job.rs
+++ b/src/server/prune_job.rs
@@ -133,7 +133,7 @@ pub fn do_prune_job(
auth_id: &Authid,
schedule: Option<String>,
) -> Result<String, Error> {
- let lookup = crate::tools::lookup_with(&store, Operation::Write);
+ let lookup = crate::tools::lookup_with(&store, Operation::WriteNonExpanding);
let datastore = DataStore::lookup_datastore(lookup)?;
let worker_type = job.jobtype().to_string();
--
2.47.3
next prev parent reply other threads:[~2026-06-02 13:01 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-02 12:58 [PATCH proxmox{,-backup} 00/11] add GarbageCollection maintenance mode Robert Obkircher
2026-06-02 12:58 ` [PATCH proxmox 1/5] pbs-api-types: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 10:33 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 2/5] pbs-api-types: use match statement for maintenance mode check Robert Obkircher
2026-06-03 10:36 ` Christian Ebner
2026-06-03 11:04 ` Robert Obkircher
2026-06-03 11:30 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 3/5] pbs-api-types: deny non-lookup operations for unknown modes Robert Obkircher
2026-06-03 10:38 ` Christian Ebner
2026-06-03 11:18 ` Robert Obkircher
2026-06-03 11:38 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 4/5] pbs-api-types: add WriteNonExpanding datastore operation Robert Obkircher
2026-06-03 10:45 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox 5/5] pbs-api-types: add GarbageCollection maintenance mode Robert Obkircher
2026-06-03 10:50 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 1/6] datastore: propagate maintenance mode parse errors Robert Obkircher
2026-06-03 11:20 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 2/6] task tracking: use parameter for initial count and refactor updates Robert Obkircher
2026-06-03 11:58 ` Christian Ebner
2026-06-02 12:58 ` [PATCH proxmox-backup 3/6] www: access active operation fields by name instead of index Robert Obkircher
2026-06-03 12:04 ` Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 4/6] task tracking: count WriteNonExpanding datastore operations Robert Obkircher
2026-06-03 12:18 ` Christian Ebner
2026-06-02 12:59 ` Robert Obkircher [this message]
2026-06-03 12:28 ` [PATCH proxmox-backup 5/6] datastore: open datastores with WriteNonExpanding instead of Write Christian Ebner
2026-06-02 12:59 ` [PATCH proxmox-backup 6/6] fix #5797: www: display new GarbageCollection maintenance mode Robert Obkircher
2026-06-03 13:03 ` Christian Ebner
2026-06-03 13:28 ` [PATCH proxmox{,-backup} 00/11] add " Christian Ebner
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=20260602130001.217482-11-r.obkircher@proxmox.com \
--to=r.obkircher@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