From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3CD3F1FF141 for ; Tue, 02 Jun 2026 15:01:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A740138B5; Tue, 2 Jun 2026 15:01:07 +0200 (CEST) From: Robert Obkircher 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 Message-ID: <20260602130001.217482-11-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260602130001.217482-1-r.obkircher@proxmox.com> References: <20260602130001.217482-1-r.obkircher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1780405216159 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.052 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: SP3ANUQOKXL2C3M74PLCCM2H3O2Y7HNG X-Message-ID-Hash: SP3ANUQOKXL2C3M74PLCCM2H3O2Y7HNG X-MailFrom: r.obkircher@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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 { - 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, ) -> Result { - 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