From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0599B1FF17E for ; Thu, 13 Nov 2025 15:22:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EDDAB1E356; Thu, 13 Nov 2025 15:22:59 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 13 Nov 2025 15:22:11 +0100 Message-ID: <20251113142214.719217-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251113142214.719217-1-c.ebner@proxmox.com> References: <20251113142214.719217-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763043719998 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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 Subject: [pbs-devel] [PATCH proxmox-backup v3 4/7] datastore: s3 refresh: set/unset maintenance mode in api handler X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Instead of setting the maintenance mode in the datastores s3 refresh helper method, do this in the api handler directly, reusing the pre- defined helpers. This is in preparation for fixing the s3 refresh to only be started after still ongoing active operations complete. Signed-off-by: Christian Ebner --- changes since version 1: - lock only after parsing auth id, ecc. - async to sync method handle transition has been split off from this pbs-datastore/src/datastore.rs | 31 ++----------------------------- src/api2/admin/datastore.rs | 22 ++++++++++++++++++++-- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index b9d4ed2d2..031fa958b 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -2305,23 +2305,12 @@ impl DataStore { *OLD_LOCKING } - /// Set the datastore's maintenance mode to `S3Refresh`, fetch from S3 object store, clear and - /// replace the local cache store contents. Once finished disable the maintenance mode again. - /// Returns with error for other datastore backends without setting the maintenance mode. + /// Fetch contents from S3 object store, clear and replace the local cache store contents. + /// Returns with error for non-S3 datastore backends. pub async fn s3_refresh(self: &Arc) -> Result<(), Error> { match self.backend()? { DatastoreBackend::Filesystem => bail!("store '{}' not backed by S3", self.name()), DatastoreBackend::S3(s3_client) => { - let self_clone = Arc::clone(self); - tokio::task::spawn_blocking(move || { - self_clone.maintenance_mode(Some(MaintenanceMode { - ty: MaintenanceType::S3Refresh, - message: None, - })) - }) - .await? - .context("failed to set maintenance mode")?; - let tmp_base = proxmox_sys::fs::make_tmp_dir(self.base_path(), None) .context("failed to create temporary content folder in {store_base}")?; @@ -2335,27 +2324,11 @@ impl DataStore { let _ = std::fs::remove_dir_all(&tmp_base); return Err(err); } - - let self_clone = Arc::clone(self); - tokio::task::spawn_blocking(move || self_clone.maintenance_mode(None)) - .await? - .context("failed to clear maintenance mode")?; } } Ok(()) } - // Set or clear the datastores maintenance mode by locking and updating the datastore config - fn maintenance_mode(&self, maintenance_mode: Option) -> Result<(), Error> { - let _lock = pbs_config::datastore::lock_config()?; - let (mut section_config, _digest) = pbs_config::datastore::config()?; - let mut datastore: DataStoreConfig = section_config.lookup("datastore", self.name())?; - datastore.set_maintenance_mode(maintenance_mode)?; - section_config.set_data(self.name(), "datastore", &datastore)?; - pbs_config::datastore::save_config(§ion_config)?; - Ok(()) - } - // Fetch the contents (metadata, no chunks) of the datastore from the S3 object store to the // provided temporaray directory async fn fetch_tmp_contents(&self, tmp_base: &Path, s3_client: &S3Client) -> Result<(), Error> { diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 25cf153d0..7bd7c9f72 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2678,12 +2678,30 @@ pub fn s3_refresh(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result