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 D6D6C1FF179 for ; Wed, 12 Nov 2025 17:35:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4DD8C9BC4; Wed, 12 Nov 2025 17:36:43 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 12 Nov 2025 17:36:20 +0100 Message-ID: <20251112163624.691139-3-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: 1762965373301 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 2/6] api: admin: make expected maintenance type helper generic over type 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" By making the helper generic over the type, it can be reused to check also for other maintenance type enum variants. The error message in case of incorrect or non-set maintenance mode now relies on the `MaintenanceType`'s string serialization. In preparation for reuse with s3 refresh. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version src/api2/admin/datastore.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index e81985169..6e66b5cf0 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -2548,8 +2548,9 @@ pub fn mount(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result Result<(pbs_config::BackupLockGuard, DataStoreConfig), Error> { let lock = pbs_config::datastore::lock_config()?; let (section_config, _digest) = pbs_config::datastore::config()?; @@ -2557,9 +2558,9 @@ fn expect_maintenance_unmounting( if store_config .get_maintenance_mode() - .is_none_or(|m| m.ty != MaintenanceType::Unmount) + .is_none_or(|m| m.ty != maintenance_type) { - bail!("maintenance mode is not 'Unmount'"); + bail!("maintenance mode is not '{maintenance_type}'"); } Ok((lock, store_config)) @@ -2590,7 +2591,9 @@ fn do_unmount_device( let mut aborted = false; while active_operations.read + active_operations.write > 0 { if let Some(worker) = worker { - if worker.abort_requested() || expect_maintenance_unmounting(&datastore.name).is_err() { + if worker.abort_requested() + || expect_maintenance_type(&datastore.name, MaintenanceType::Unmount).is_err() + { aborted = true; break; } @@ -2608,7 +2611,7 @@ fn do_unmount_device( } if aborted || worker.is_some_and(|w| w.abort_requested()) { - let _ = expect_maintenance_unmounting(&datastore.name) + let _ = expect_maintenance_type(&datastore.name, MaintenanceType::Unmount) .inspect_err(|e| warn!("maintenance mode was not as expected: {e}")) .and_then(|(lock, config)| { unset_maintenance(lock, config) @@ -2616,7 +2619,7 @@ fn do_unmount_device( }); bail!("aborted, due to user request"); } else { - let (lock, config) = expect_maintenance_unmounting(&datastore.name)?; + let (lock, config) = expect_maintenance_type(&datastore.name, MaintenanceType::Unmount)?; crate::tools::disks::unmount_by_mountpoint(Path::new(&mount_point))?; unset_maintenance(lock, config) .map_err(|e| format_err!("could not reset maintenance mode: {e}"))?; -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel