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 840831FF17E for ; Thu, 13 Nov 2025 15:22:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 97D7D1E339; 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:12 +0100 Message-ID: <20251113142214.719217-6-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: 1763043720234 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 5/7] api: datastore: wait for active operations to clear before s3 refresh 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" Currently, the s3 refresh does not take into consideration already ongoing active operations, only blocking new ones. This will however lead to inconsistencies if there are ongoing read or write operations. Therefore, actively wait for ongoing operatioins to complete before running the actual refresh and keep the datastore config locked so the maintenance mode cannot be altered.If an abort was requested while waiting, clear the maintenance mode as well. By adding this as helper, it can be reuse for datastore recreation as well. Signed-off-by: Christian Ebner --- changes since version 1: - use dedicated helper which can be reused also for datastore recreation src/api2/admin/datastore.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 7bd7c9f72..8fc5efe41 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2674,7 +2674,6 @@ pub async fn unmount(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result Result { - let datastore = DataStore::lookup_datastore(&store, Some(Operation::Lookup))?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; @@ -2696,17 +2695,21 @@ pub fn s3_refresh(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result Result<(), Error> { + let datastore = DataStore::lookup_datastore(&store, Some(Operation::Lookup))?; + run_maintenance_locked(&store, MaintenanceType::S3Refresh, worker, || { + proxmox_async::runtime::block_on(datastore.s3_refresh()) + }) +} + /// Wait for no more active operations on the given datastore and run the provided callback in /// a datastore locked context, protecting against maintenance mode changes. fn run_maintenance_locked( -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel