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 C1A5B1FF136 for ; Mon, 20 Apr 2026 09:43:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 866491EF42; Mon, 20 Apr 2026 09:43:10 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 2/3] api: datastore: add option to run garbage collection before unmount Date: Mon, 20 Apr 2026 09:42:56 +0200 Message-ID: <20260420074257.9492-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260420074257.9492-1-h.laimer@proxmox.com> References: <20260420074257.9492-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776670903454 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.082 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: HO4HDHNE4DWTEAG3BFDGJWWDRNGYHPWP X-Message-ID-Hash: HO4HDHNE4DWTEAG3BFDGJWWDRNGYHPWP X-MailFrom: h.laimer@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: Removable datastores set up for auto-unmount have no natural point at which to run garbage collection, since the drive is unmounted right after jobs finish. Expose a gc-on-unmount option so GC can be triggered as part of the unmount for those setups. Relies on the active write operation by garbage collection to block the unmount task until GC completes (among possible other active operations). No other active operation can occur in the meantime since the datastore remains in 'unmount' maintenance mode. Signed-off-by: Hannes Laimer --- src/api2/admin/datastore.rs | 23 ++++++++++++++++++++--- src/api2/config/datastore.rs | 9 +++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 757b3114..212a48da 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2641,9 +2641,8 @@ fn do_unmount_device( } async fn do_unmount(store: String, auth_id: Authid, to_stdout: bool) -> Result { - let _lock = pbs_config::datastore::lock_config()?; - let (mut section_config, _digest) = pbs_config::datastore::config()?; - let mut datastore: DataStoreConfig = section_config.lookup("datastore", &store)?; + let (section_config, _digest) = pbs_config::datastore::config()?; + let datastore: DataStoreConfig = section_config.lookup("datastore", &store)?; if datastore.backing_device.is_none() { bail!("datastore '{store}' is not removable"); @@ -2651,6 +2650,24 @@ async fn do_unmount(store: String, auth_id: Authid, to_stdout: bool) -> Result info!("started garbage collection, unmount will wait for it to finish"), + Err(err) => warn!("unable to start garbage collection before unmount: {err}"), + } + } + + let _lock = pbs_config::datastore::lock_config()?; + let (mut section_config, _digest) = pbs_config::datastore::config()?; + let mut datastore: DataStoreConfig = section_config.lookup("datastore", &store)?; + datastore.set_maintenance_mode(Some(MaintenanceMode { ty: MaintenanceType::Unmount, message: None, diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index c44d50d1..c0be0296 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -409,6 +409,8 @@ pub enum DeletableProperty { Comment, /// Delete the garbage collection schedule. GcSchedule, + /// Delete the gc-on-unmount property. + GcOnUnmount, /// Delete the prune job schedule. PruneSchedule, /// Delete the keep-last property @@ -495,6 +497,9 @@ pub fn update_datastore( DeletableProperty::GcSchedule => { data.gc_schedule = None; } + DeletableProperty::GcOnUnmount => { + data.gc_on_unmount = None; + } DeletableProperty::PruneSchedule => { data.prune_schedule = None; } @@ -560,6 +565,10 @@ pub fn update_datastore( data.gc_schedule = update.gc_schedule; } + if update.gc_on_unmount.is_some() { + data.gc_on_unmount = update.gc_on_unmount; + } + macro_rules! prune_disabled { ($(($param:literal, $($member:tt)+)),+) => { $( -- 2.47.3