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 7C1251FF17E for ; Thu, 13 Nov 2025 15:22:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8EB511E26F; Thu, 13 Nov 2025 15:22:58 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 13 Nov 2025 15:22:08 +0100 Message-ID: <20251113142214.719217-2-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: 1763043719267 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 1/7] api: admin: drop useless option for do_unmount_device() parameter 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" This helper method is always called with the worker task context present, so do not make it an optional parameter. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version src/api2/admin/datastore.rs | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 6e66b5cf0..935933bc5 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2579,7 +2579,7 @@ fn unset_maintenance( fn do_unmount_device( datastore: DataStoreConfig, - worker: Option<&dyn WorkerTaskContext>, + worker: &dyn WorkerTaskContext, ) -> Result<(), Error> { if datastore.backing_device.is_none() { bail!("can't unmount non-removable datastore"); @@ -2590,27 +2590,25 @@ fn do_unmount_device( let mut old_status = String::new(); let mut aborted = false; while active_operations.read + active_operations.write > 0 { - if let Some(worker) = worker { - if worker.abort_requested() - || expect_maintenance_type(&datastore.name, MaintenanceType::Unmount).is_err() - { - aborted = true; - break; - } - let status = format!( - "cannot unmount yet, still {} read and {} write operations active", - active_operations.read, active_operations.write - ); - if status != old_status { - info!("{status}"); - old_status = status; - } + if worker.abort_requested() + || expect_maintenance_type(&datastore.name, MaintenanceType::Unmount).is_err() + { + aborted = true; + break; + } + let status = format!( + "cannot unmount yet, still {} read and {} write operations active", + active_operations.read, active_operations.write + ); + if status != old_status { + info!("{status}"); + old_status = status; } std::thread::sleep(std::time::Duration::from_secs(1)); active_operations = task_tracking::get_active_operations(&datastore.name)?; } - if aborted || worker.is_some_and(|w| w.abort_requested()) { + if aborted || worker.abort_requested() { let _ = expect_maintenance_type(&datastore.name, MaintenanceType::Unmount) .inspect_err(|e| warn!("maintenance mode was not as expected: {e}")) .and_then(|(lock, config)| { @@ -2686,7 +2684,7 @@ pub async fn unmount(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result