From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
	by lore.proxmox.com (Postfix) with ESMTPS id E76E41FF179
	for <inbox@lore.proxmox.com>; Wed, 12 Nov 2025 17:36:25 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 76C4E9D16;
	Wed, 12 Nov 2025 17:37:13 +0100 (CET)
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 12 Nov 2025 17:36:24 +0100
Message-ID: <20251112163624.691139-7-c.ebner@proxmox.com>
X-Mailer: git-send-email 2.47.3
In-Reply-To: <20251112163624.691139-1-c.ebner@proxmox.com>
References: <20251112163624.691139-1-c.ebner@proxmox.com>
MIME-Version: 1.0
X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2
X-Bm-Transport-Timestamp: 1762965374703
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 v2 6/6] 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
 <pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, 
 <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
 <pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>

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.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
changes since version 1:
- use refactored helpers from identical unmount logic

 src/api2/admin/datastore.rs | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 91189d7ae..93e085be3 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -2716,11 +2716,29 @@ pub fn s3_refresh(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result<Valu
         Some(store.clone()),
         auth_id.to_string(),
         to_stdout,
-        move |_worker| {
-            proxmox_async::runtime::block_on(datastore.s3_refresh())?;
-
-            let (_lock, config) = expect_maintenance_type(&store, MaintenanceType::S3Refresh)?;
-            unset_maintenance(_lock, config).context("failed to clear maintenance mode")
+        move |worker| {
+            let mut old_status = String::new();
+            let aborted = wait_on_active_operations(
+                &store,
+                Some(&worker),
+                MaintenanceType::S3Refresh,
+                |reads, writes| {
+                    let status = format!(
+                        "waiting for active operations to finsish: read {reads}, write {writes}",
+                    );
+                    if status != old_status {
+                        info!("{status}");
+                        old_status = status;
+                    }
+                },
+            )?;
+            clear_or_run_maintenance_locked(
+                &store,
+                Some(&worker),
+                MaintenanceType::S3Refresh,
+                aborted,
+                || proxmox_async::runtime::block_on(datastore.s3_refresh()),
+            )
         },
     )?;
 
-- 
2.47.3



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel